On Thu, Dec 05, 2013 at 11:00:42PM -0500, Brad Smith wrote: > Here is an update to libvpx 1.2.0. > > OK?
All i know is that libvpx 1.2.0 got just merged in mozilla-central, and they're already working on the upcoming 1.3.0 for vp9 support. https://bugzilla.mozilla.org/show_bug.cgi?id=918550 https://bugzilla.mozilla.org/show_bug.cgi?id=763495 I'll try to enable --with-system-libvpx within firefox, since now iirc it's more supported (and less patched) than before. Landry > Index: Makefile > =================================================================== > RCS file: /home/cvs/ports/multimedia/libvpx/Makefile,v > retrieving revision 1.12 > diff -u -p -r1.12 Makefile > --- Makefile 7 Aug 2013 21:32:15 -0000 1.12 > +++ Makefile 6 Dec 2013 02:54:49 -0000 > @@ -2,15 +2,14 @@ > > 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_VERS > USE_GMAKE= Yes > CONFIGURE_STYLE= simple > CONFIGURE_ARGS+=--prefix=${PREFIX} \ > - --disable-optimizations > + --disable-optimizations \ > + --disable-unit-tests > CONFIGURE_ENV= LD="${CC}" > > NO_TEST= Yes > Index: distinfo > =================================================================== > RCS file: /home/cvs/ports/multimedia/libvpx/distinfo,v > retrieving revision 1.5 > diff -u -p -r1.5 distinfo > --- distinfo 22 May 2012 18:22:50 -0000 1.5 > +++ distinfo 6 Dec 2013 02:38:23 -0000 > @@ -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 > Index: patches/patch-build_make_Makefile > =================================================================== > RCS file: > /home/cvs/ports/multimedia/libvpx/patches/patch-build_make_Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-build_make_Makefile > --- patches/patch-build_make_Makefile 28 Aug 2012 13:04:01 -0000 1.4 > +++ patches/patch-build_make_Makefile 6 Dec 2013 02:44:18 -0000 > @@ -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 > +--- 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. > -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)))) > Index: patches/patch-build_make_gen_asm_deps_sh > =================================================================== > RCS file: > /home/cvs/ports/multimedia/libvpx/patches/patch-build_make_gen_asm_deps_sh,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-build_make_gen_asm_deps_sh > --- patches/patch-build_make_gen_asm_deps_sh 22 May 2012 18:22:50 -0000 > 1.3 > +++ patches/patch-build_make_gen_asm_deps_sh 6 Dec 2013 01:37:14 -0000 > @@ -7,12 +7,3 @@ $OpenBSD: patch-build_make_gen_asm_deps_ > ## > ## 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 > Index: patches/patch-configure > =================================================================== > RCS file: /home/cvs/ports/multimedia/libvpx/patches/patch-configure,v > retrieving revision 1.7 > diff -u -p -r1.7 patch-configure > --- patches/patch-configure 22 May 2012 18:22:50 -0000 1.7 > +++ patches/patch-configure 6 Dec 2013 02:44:19 -0000 > @@ -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 > +--- 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/ > 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/ > # 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/ > - # 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." > Index: patches/patch-libs_mk > =================================================================== > RCS file: /home/cvs/ports/multimedia/libvpx/patches/patch-libs_mk,v > retrieving revision 1.6 > diff -u -p -r1.6 patch-libs_mk > --- patches/patch-libs_mk 27 Aug 2012 20:42:25 -0000 1.6 > +++ patches/patch-libs_mk 6 Dec 2013 02:44:33 -0000 > @@ -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 > +--- 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 > > 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 > 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 > Index: patches/patch-vp8_common_sad_c_c > =================================================================== > RCS file: /home/cvs/ports/multimedia/libvpx/patches/patch-vp8_common_sad_c_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-vp8_common_sad_c_c > --- patches/patch-vp8_common_sad_c_c 22 May 2012 18:22:50 -0000 1.1 > +++ patches/patch-vp8_common_sad_c_c 6 Dec 2013 02:44:22 -0000 > @@ -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 @@ > - > +--- 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 > +#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, > Index: pkg/PFRAG.shared > =================================================================== > RCS file: pkg/PFRAG.shared > diff -N pkg/PFRAG.shared > --- pkg/PFRAG.shared 4 Oct 2010 23:56:16 -0000 1.1.1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -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} > Index: pkg/PLIST > =================================================================== > RCS file: /home/cvs/ports/multimedia/libvpx/pkg/PLIST,v > retrieving revision 1.4 > diff -u -p -r1.4 PLIST > --- pkg/PLIST 22 May 2012 18:22:50 -0000 1.4 > +++ pkg/PLIST 6 Dec 2013 02:06:17 -0000 > @@ -1,5 +1,4 @@ > @comment $OpenBSD: PLIST,v 1.4 2012/05/22 18:22:50 ajacoutot Exp $ > -%%SHARED%% > @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 > > -- > This message has been scanned for viruses and > dangerous content by MailScanner, and is > believed to be clean. >
