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

Update to libvpx 1.3.0.

Browse Source 
ok ajacoutot@
This commit is contained in:
brad 2014-04-29 23:58:06 +00:00
parent 1b34b5a17a
commit 830dc7bd73
12 changed files with 91 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
multimedia/libvpx/Makefile
View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.13 2014/03/17 14:01:08 brad Exp $
# $OpenBSD: Makefile,v 1.14 2014/04/29 23:58:06 brad Exp $
COMMENT= Google VP8 video codec
COMMENT= Google VP8/VP9 video codec
V= 1.2.0
V= 1.3.0
DISTNAME= libvpx-v${V}
PKGNAME= libvpx-${V}
CATEGORIES= multimedia
MASTER_SITES= https://webm.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= vpx 4.1
SHARED_LIBS= vpx 5.0
HOMEPAGE= http://www.webmproject.org/
@ -22,6 +22,10 @@ WANTLIB= c m pthread
BUILD_DEPENDS+= shells/bash
MODULES= lang/clang
MODCLANG_ARCHS= amd64 i386
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= devel/yasm
.endif
@ -31,22 +35,27 @@ SUBST_VARS= BASH
MAKE_FLAGS= LIBVPX_VERSION=${LIBvpx_VERSION} verbose=yes
# compiler spins at 100% CPU on one particular file. using -O1
# works around the issue.
.if ${MACHINE_ARCH} == "sparc64"
CFLAGS+= -O1
.endif
USE_GMAKE= Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+=--prefix=${PREFIX} \
--disable-optimizations \
--disable-unit-tests
CONFIGURE_ENV= LD="${CC}"
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
CONFIGURE_ENV+= CC="clang"
.endif
NO_TEST= Yes
ALL_TARGET=
SUBST_FILES= build/make/configure.sh \
build/make/gen_asm_deps.sh \
build/make/version.sh \
configure \
examples/gen_example_code.sh \
SUBST_FILES= examples/gen_example_code.sh \
examples/gen_example_text.sh
pre-configure:

4
multimedia/libvpx/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libvpx-v1.2.0.tar.bz2) = XvDGULLapiCF64EFp6QnPz6YfbU8Xsl/1R0bZRHlqgY=
SIZE (libvpx-v1.2.0.tar.bz2) = 1714121
SHA256 (libvpx-v1.3.0.tar.bz2) = 09zI2Er1HGw4KyFDl8YkAuN6eZ6OvNpvQheu8AEEUak=
SIZE (libvpx-v1.3.0.tar.bz2) = 2084229

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

@ -1,22 +1,31 @@
$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
$OpenBSD: patch-build_make_Makefile,v 1.6 2014/04/29 23:58:06 brad Exp $
--- build/make/Makefile.orig Fri Jan 10 15:12:42 2014
+++ build/make/Makefile Sun Apr 20 03:09:26 2014
@@ -158,7 +158,7 @@ $(BUILD_PFX)%.s.o: %.s
$(qexec)$(AS) $(ASFLAGS) -o $@ $<
.PRECIOUS: %.c.S
-%.c.S: CFLAGS += -DINLINE_ASM
+%.c.S: CFLAGS += -DINLINE_ASM -fno-integrated-as
$(BUILD_PFX)%.c.S: %.c
$(if $(quiet),@echo " [GEN] $@")
$(qexec)$(CC) -S $(CFLAGS) -o $@ $<
@@ -267,8 +267,7 @@ define so_template
# This needs further abstraction for dealing with non-GNU linkers.
$(1):
$(if $(quiet),@echo " [LD] $$@")
- $(qexec)$$(LD) -shared $$(LDFLAGS) \
- -Wl,--no-undefined -Wl,-soname,$$(SONAME) \
+ $(qexec)$$(LD) -shared -fPIC $$(LDFLAGS) \
-Wl,--version-script,$$(SO_VERSION_SCRIPT) -o $$@ \
$$(filter %.o,$$?) $$(extralibs)
-Wl,--version-script,$$(EXPORTS_FILE) -o $$@ \
$$(filter %.o,$$^) $$(extralibs)
endef
@@ -320,7 +319,7 @@ LIBS=$(call enabled,LIBS)
@@ -351,7 +350,7 @@ LIBS=$(call enabled,LIBS)
.libs: $(LIBS)
@touch $@
$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
-$(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
+$(foreach lib,$(filter %so.$(LIBVPX_VERSION),$(LIBS)),$(eval $(call so_template,$(lib))))
$(foreach lib,$(filter %$(VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)
ifeq ($(MAKECMDGOALS),dist)

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

@ -1,9 +0,0 @@
$OpenBSD: patch-build_make_configure_sh,v 1.6 2012/08/27 20:42:25 jasper 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
##

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

@ -1,9 +0,0 @@
$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 @@
-#!/bin/bash
+#!${BASH}
##
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##

9
multimedia/libvpx/patches/patch-build_make_version_sh
View File

@ -1,9 +0,0 @@
$OpenBSD: patch-build_make_version_sh,v 1.2 2010/10/31 21:05:38 ckuethe Exp $
--- build/make/version.sh.orig Thu Oct 28 09:14:14 2010
+++ build/make/version.sh Thu Oct 28 21:59:18 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${BASH}
##
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##

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

@ -1,22 +1,16 @@
$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
##
@@ -104,6 +104,7 @@ all_platforms="${all_platforms} ppc32-linux-gcc"
$OpenBSD: patch-configure,v 1.9 2014/04/29 23:58:06 brad Exp $
--- configure.orig Fri Jan 10 15:12:42 2014
+++ configure Mon Feb 17 14:39:50 2014
@@ -108,6 +108,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"
+all_platforms="${all_platforms} sparc-linux-gcc"
all_platforms="${all_platforms} sparc-solaris-gcc"
all_platforms="${all_platforms} x86-android-gcc"
all_platforms="${all_platforms} x86-darwin8-gcc"
all_platforms="${all_platforms} x86-darwin8-icc"
@@ -146,19 +147,6 @@ for t in ${all_targets}; do
[ -f ${source_path}/${t}.mk ] && enable ${t}
@@ -160,19 +161,6 @@ for t in ${all_targets}; do
[ -f ${source_path}/${t}.mk ] && enable_feature ${t}
done
-# check installed doxygen version
@ -27,15 +21,15 @@ $OpenBSD: patch-configure,v 1.8 2014/03/17 14:01:09 brad Exp $
- doxy_minor=${doxy_version%%.*}
- doxy_patch=${doxy_version##*.}
-
- [ $doxy_major -gt 1 ] && enable doxygen
- [ $doxy_minor -gt 5 ] && enable doxygen
- [ $doxy_minor -eq 5 ] && [ $doxy_patch -ge 3 ] && enable doxygen
- [ $doxy_major -gt 1 ] && enable_feature doxygen
- [ $doxy_minor -gt 5 ] && enable_feature doxygen
- [ $doxy_minor -eq 5 ] && [ $doxy_patch -ge 3 ] && enable_feature doxygen
-fi
-
# 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.
@@ -452,18 +440,6 @@ EOF
@@ -501,18 +489,6 @@ EOF
}
process_detect() {
@ -51,6 +45,6 @@ $OpenBSD: patch-configure,v 1.8 2014/03/17 14:01:09 brad Exp $
- fi
- fi
- fi
if [ -z "$CC" ]; then
if [ -z "$CC" ] || enabled external_build; then
echo "Bypassing toolchain for environment detection."
enable external_build
enable_feature external_build

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

@ -1,12 +1,12 @@
$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)
$OpenBSD: patch-examples_mk,v 1.3 2014/04/29 23:58:06 brad Exp $
--- examples.mk.orig Fri Jan 10 15:12:42 2014
+++ examples.mk Mon Feb 17 14:41:02 2014
@@ -192,7 +192,7 @@ BINS-$(NOT_MSVS) += $(addprefix $(BUILD_PFX)
# Instantiate linker template for all examples.
CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)
-CODEC_LIB_SUF=$(if $(CONFIG_SHARED),.so,.a)
+CODEC_LIB_SUF=$(if $(CONFIG_SHARED),.so.$(LIBVPX_VERSION),.a)
SHARED_LIB_SUF=$(if $(filter darwin%,$(TGT_OS)),.dylib,.so)
-CODEC_LIB_SUF=$(if $(CONFIG_SHARED),$(SHARED_LIB_SUF),.a)
+CODEC_LIB_SUF=$(if $(CONFIG_SHARED),$(SHARED_LIB_SUF).$(LIBVPX_VERSION),.a)
$(foreach bin,$(BINS-yes),\
$(if $(BUILD_OBJS),$(eval $(bin):\
$(LIB_PATH)/lib$(CODEC_LIB)$(CODEC_LIB_SUF)))\

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

@ -1,27 +1,30 @@
$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))
$OpenBSD: patch-libs_mk,v 1.8 2014/04/29 23:58:06 brad Exp $
--- libs.mk.orig Fri Jan 10 15:12:42 2014
+++ libs.mk Mon Feb 17 15:19:19 2014
@@ -271,19 +271,14 @@ EXPORT_FILE := libvpx.syms
LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
libvpx.dylib )
else
-LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
-LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\
- $(notdir $(LIBVPX_SO_SYMLINKS))
+LIBVPX_SO := libvpx.so.$(LIBVPX_VERSION)
+LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver
$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
-$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR)
$(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver
EXPORT_FILE := libvpx.ver
SYM_LINK := libvpx.so
-LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
- libvpx.so libvpx.so.$(VERSION_MAJOR) \
- libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR))
endif
-LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\
- $(notdir $(LIBVPX_SO_SYMLINKS))
+LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE)
$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
-$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR)
$(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
libvpx.ver: $(call enabled,CODEC_EXPORTS)
@echo " [CREATE] $@"
@@ -205,14 +200,6 @@ $(1): $(2)
$(qexec)ln -sf $(LIBVPX_SO) $$@
@@ -305,15 +300,7 @@ $(1): $(2)
$(qexec)ln -sf $(2) $$@
endef
-$(eval $(call libvpx_symlink_template,\
@ -29,9 +32,10 @@ $OpenBSD: patch-libs_mk,v 1.7 2014/03/17 14:01:09 brad Exp $
- $(BUILD_PFX)$(LIBVPX_SO)))
-$(eval $(call libvpx_symlink_template,\
- $(addprefix $(DIST_DIR)/,$(LIBVPX_SO_SYMLINKS)),\
- $(DIST_DIR)/$(LIBSUBDIR)/$(LIBVPX_SO)))
-
-INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBVPX_SO_SYMLINKS)
INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/$(LIBVPX_SO)
- $(LIBVPX_SO)))
-
-INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBVPX_SO_SYMLINKS)
INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBSUBDIR)/$(LIBVPX_SO)
LIBS-$(BUILD_LIBVPX) += vpx.pc

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

@ -1,13 +1,13 @@
$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
$OpenBSD: patch-vp8_common_reconinter_c,v 1.2 2014/04/29 23:58:06 brad Exp $
--- vp8/common/reconinter.c.orig Fri Jan 10 15:12:40 2014
+++ vp8/common/reconinter.c Mon Feb 17 14:37:59 2014
@@ -10,6 +10,7 @@
#include <limits.h>
+#include <sys/types.h>
#include "vpx_config.h"
#include "vpx_rtcd.h"
#include "vp8_rtcd.h"
#include "vpx/vpx_integer.h"
@@ -17,6 +18,10 @@
#include "reconinter.h"

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

@ -1,4 +1,4 @@
$OpenBSD: patch-vp8_common_sad_c_c,v 1.2 2014/03/17 14:01:09 brad Exp $
$OpenBSD: patch-vp8_common_sad_c_c,v 1.3 2014/04/29 23:58:06 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 @@

6
multimedia/libvpx/pkg/PLIST
View File

@ -1,14 +1,14 @@
@comment $OpenBSD: PLIST,v 1.5 2014/03/17 14:01:09 brad Exp $
@comment $OpenBSD: PLIST,v 1.6 2014/04/29 23:58:06 brad Exp $
@bin bin/vp8_scalable_patterns
@bin bin/vp9_spatial_scalable_encoder
@bin bin/vpxdec
@bin bin/vpxenc
include/vpx/
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_codec_impl_bottom.h
include/vpx/vpx_codec_impl_top.h
include/vpx/vpx_decoder.h
include/vpx/vpx_encoder.h
include/vpx/vpx_image.h