summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libvpx/Makefile8
-rw-r--r--multimedia/libvpx/PLIST3
-rw-r--r--multimedia/libvpx/buildlink3.mk4
-rw-r--r--multimedia/libvpx/distinfo19
-rw-r--r--multimedia/libvpx/patches/patch-aa64
-rw-r--r--multimedia/libvpx/patches/patch-ab27
-rw-r--r--multimedia/libvpx/patches/patch-ac6
-rw-r--r--multimedia/libvpx/patches/patch-ad38
-rw-r--r--multimedia/libvpx/patches/patch-ae15
-rw-r--r--multimedia/libvpx/patches/patch-af12
10 files changed, 105 insertions, 91 deletions
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index d5968c25f69..ae3fd4b2b73 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2011/10/28 14:09:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2012/01/31 11:53:51 ryoon Exp $
-DISTNAME= libvpx-v0.9.7-p1
-PKGNAME= ${DISTNAME:S/-v/-/:S/-p/./}
+DISTNAME= libvpx-v1.0.0
+PKGNAME= ${DISTNAME:S/-v/-/}
CATEGORIES= multimedia
MASTER_SITES= http://webm.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
@@ -17,6 +17,7 @@ USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= gmake bash:build perl:build
HAS_CONFIGURE= yes
+CONFIG_SHELL= ${BASH}
CONFIGURE_ARGS+= --disable-postproc
CONFIGURE_ARGS+= --enable-pic
CONFIGURE_ARGS+= --enable-runtime-cpu-detect
@@ -29,6 +30,7 @@ BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
.endif
REPLACE_BASH= configure \
+ build/make/configure.sh \
build/make/version.sh \
build/make/gen_asm_deps.sh \
examples/gen_example_text.sh \
diff --git a/multimedia/libvpx/PLIST b/multimedia/libvpx/PLIST
index 430c93da756..ba7f74814fd 100644
--- a/multimedia/libvpx/PLIST
+++ b/multimedia/libvpx/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2011/08/07 17:20:09 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/01/31 11:53:51 ryoon Exp $
+bin/vp8_scalable_patterns
bin/vpxdec
bin/vpxenc
include/vpx/vp8.h
diff --git a/multimedia/libvpx/buildlink3.mk b/multimedia/libvpx/buildlink3.mk
index 5d248f9727c..c29168391d0 100644
--- a/multimedia/libvpx/buildlink3.mk
+++ b/multimedia/libvpx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/01/19 21:15:51 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2012/01/31 11:53:51 ryoon Exp $
BUILDLINK_TREE+= libvpx
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libvpx
LIBVPX_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libvpx+= libvpx>=0.9.2
-BUILDLINK_ABI_DEPENDS.libvpx+= libvpx>=0.9.2
+BUILDLINK_ABI_DEPENDS.libvpx+= libvpx>=1.0.0
BUILDLINK_PKGSRCDIR.libvpx?= ../../multimedia/libvpx
.include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index b17a4f4cad1..570eb4aa3b0 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.9 2012/01/07 12:18:47 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2012/01/31 11:53:51 ryoon Exp $
-SHA1 (libvpx-v0.9.7-p1.tar.bz2) = dacfefaf3363f781de43858f09cdd0b0d469e6fc
-RMD160 (libvpx-v0.9.7-p1.tar.bz2) = 8a9e011d1039fee132ecd9f6feb1055815b7b777
-Size (libvpx-v0.9.7-p1.tar.bz2) = 1244783 bytes
-SHA1 (patch-aa) = 77f98144d28166ac26f76bb349303c0766633a99
-SHA1 (patch-ab) = d2932c6e3a1039315f9e0361456ab8037de7aa08
-SHA1 (patch-ac) = 9c7ed134d8b85734dc81ed1eb2e3ada2b753c802
-SHA1 (patch-ad) = f1963d5997afb486f53bb94ab6b60c6eb3edc626
-SHA1 (patch-ae) = 15cc4d0a043bd66c48ebe43612a8619533afca04
-SHA1 (patch-af) = 5c9333117590df51069780f1ff0b220dc2723e49
+SHA1 (libvpx-v1.0.0.tar.bz2) = 2919e11074fef72fc61ef1a75160050ffaad6074
+RMD160 (libvpx-v1.0.0.tar.bz2) = 2ee5a2e7f4cb2f126c6d0d9a36e8636455f42915
+Size (libvpx-v1.0.0.tar.bz2) = 1641411 bytes
+SHA1 (patch-aa) = 92cf9f88f08ab6a9b15fa814d6bb9f45eeb76d94
+SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b
+SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3
+SHA1 (patch-ad) = 9263176218e1a6dd70b55101cd047a34746109a9
+SHA1 (patch-af) = 01ad55ae9a30c079267b7a7af6b644d56a3e57e3
diff --git a/multimedia/libvpx/patches/patch-aa b/multimedia/libvpx/patches/patch-aa
index f3b413393fe..e23ce8bd6c8 100644
--- a/multimedia/libvpx/patches/patch-aa
+++ b/multimedia/libvpx/patches/patch-aa
@@ -1,17 +1,28 @@
-$NetBSD: patch-aa,v 1.3 2011/08/07 17:20:09 ryoon Exp $
+$NetBSD: patch-aa,v 1.4 2012/01/31 11:53:52 ryoon Exp $
---- build/make/Makefile.orig 2011-08-04 17:30:15.000000000 +0000
+--- build/make/Makefile.orig 2012-01-27 18:36:39.000000000 +0000
+++ build/make/Makefile
-@@ -102,7 +102,7 @@ $(BUILD_PFX)%.c.d: %.c
+@@ -106,16 +106,16 @@ $(BUILD_PFX)%.c.d: %.c
$(BUILD_PFX)%.c.o: %.c
$(if $(quiet),@echo " [CC] $@")
- $(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
+ $(qexec)${LIBTOOL} --mode=compile $(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
+ $(BUILD_PFX)%.cc.d: %.cc
+ $(if $(quiet),@echo " [DEP] $@")
+ $(qexec)mkdir -p $(dir $@)
+- $(qexec)g++ $(INTERNAL_CFLAGS) $(CFLAGS) -M $< | $(fmt_deps) > $@
++ $(qexec)${CXX} $(INTERNAL_CFLAGS) $(CFLAGS) -M $< | $(fmt_deps) > $@
+
+ $(BUILD_PFX)%.cc.o: %.cc
+ $(if $(quiet),@echo " [CXX] $@")
+- $(qexec)g++ $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
++ $(qexec)${LIBTOOL} --mode=compile ${CXX} $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
+
$(BUILD_PFX)%.asm.d: %.asm
$(if $(quiet),@echo " [DEP] $@")
-@@ -112,7 +112,8 @@ $(BUILD_PFX)%.asm.d: %.asm
+@@ -125,7 +125,8 @@ $(BUILD_PFX)%.asm.d: %.asm
$(BUILD_PFX)%.asm.o: %.asm
$(if $(quiet),@echo " [AS] $@")
@@ -21,7 +32,7 @@ $NetBSD: patch-aa,v 1.3 2011/08/07 17:20:09 ryoon Exp $
$(BUILD_PFX)%.s.d: %.s
$(if $(quiet),@echo " [DEP] $@")
-@@ -194,7 +195,8 @@ define linker_template
+@@ -207,13 +208,15 @@ define linker_template
$(1): $(filter-out -%,$(2))
$(1):
$(if $(quiet),@echo " [LD] $$@")
@@ -29,9 +40,17 @@ $NetBSD: patch-aa,v 1.3 2011/08/07 17:20:09 ryoon Exp $
+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $$@ \
+ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
endef
+ define linkerxx_template
+ $(1): $(filter-out -%,$(2))
+ $(1):
+ $(if $(quiet),@echo " [LD] $$@")
+- $(qexec)g++ $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
++ $(qexec)${LIBTOOL} --mode=link ${CXX} $(LDFLAGS) -o $$@ \
++ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
+ endef
# make-3.80 has a bug with expanding large input strings to the eval function,
# which was triggered in some cases by the following component of
-@@ -207,8 +209,12 @@ endef
+@@ -226,8 +229,12 @@ endef
define install_map_template
$(DIST_DIR)/$(1): $(2)
$(if $(quiet),@echo " [INSTALL] $$@")
@@ -46,23 +65,48 @@ $NetBSD: patch-aa,v 1.3 2011/08/07 17:20:09 ryoon Exp $
endef
define archive_template
-@@ -217,7 +223,9 @@ define archive_template
+@@ -236,7 +243,9 @@ define archive_template
# for creating them.
$(1):
$(if $(quiet),@echo " [AR] $$@")
- $(qexec)$$(AR) $$(ARFLAGS) $$@ $$?
+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $$(patsubst %.a,%.la,$$@) \
+ $$(patsubst %.o,%.lo,$$?) -rpath $(PREFIX)/lib $$(extralibs) \
-+ -version-info $(VERSION_MINOR):$(VERSION_PATCH):$(VERSION_MINOR)
++ -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_PATCH)
endef
define so_template
-@@ -296,7 +304,7 @@ clean::
+@@ -313,20 +322,20 @@ clean::
+ rm -f .bins .install-bins $(BINS)
+
LIBS=$(call enabled,LIBS)
- .libs: $(LIBS)
+-.libs: $(LIBS)
++dot.libs: $(LIBS)
@touch $@
-$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
+$(foreach lib,$(filter %.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
$(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)
+ ifeq ($(MAKECMDGOALS),dist)
+ INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS)
+ endif
+-.install-libs: .libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS))
++.install-libs: dot.libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS))
+ @touch $@
+
+ clean::
+- rm -f .libs .install-libs $(LIBS)
++ rm -f dot.libs .install-libs $(LIBS)
+
+ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
+ PROJECTS=$(call enabled,PROJECTS)
+@@ -376,7 +385,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
+ BUILD_TARGETS += .projects
+ INSTALL_TARGETS += .install-projects
+ endif
+-BUILD_TARGETS += .docs .libs .bins
++BUILD_TARGETS += .docs dot.libs .bins
+ INSTALL_TARGETS += .install-docs .install-srcs .install-libs .install-bins
+ all: $(BUILD_TARGETS)
+ install:: $(INSTALL_TARGETS)
diff --git a/multimedia/libvpx/patches/patch-ab b/multimedia/libvpx/patches/patch-ab
index f9a7d6dd2cd..db86312d3ff 100644
--- a/multimedia/libvpx/patches/patch-ab
+++ b/multimedia/libvpx/patches/patch-ab
@@ -1,8 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2012/01/07 12:18:47 ryoon Exp $
+$NetBSD: patch-ab,v 1.4 2012/01/31 11:53:52 ryoon Exp $
-http://git.chromium.org/gitweb/?p=webm/libvpx.git;a=commitdiff;h=17c754fc00881a78e71488e7c544d05cf2f6927f
-
---- libs.mk.orig 2011-08-15 21:02:45.000000000 +0000
+--- libs.mk.orig 2012-01-27 18:36:39.000000000 +0000
+++ libs.mk
@@ -188,8 +188,8 @@ endif
else
@@ -15,24 +13,3 @@ http://git.chromium.org/gitweb/?p=webm/libvpx.git;a=commitdiff;h=17c754fc00881a7
BUILD_LIBVPX_SO := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))
LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
-@@ -281,17 +281,17 @@ $(filter %$(ASM).o,$(OBJS-yes)): $(BUILD
-
- ifeq ($(filter icc gcc,$(TGT_CC)), $(TGT_CC))
- $(BUILD_PFX)asm_com_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S
-- grep EQU $< | tr -d '$$\#' $(ADS2GAS) > $@
-+ grep -w EQU $< | tr -d '$$\#' $(ADS2GAS) > $@
- $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S: $(VP8_PREFIX)common/asm_com_offsets.c
- CLEAN-OBJS += $(BUILD_PFX)asm_com_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S
-
- $(BUILD_PFX)asm_enc_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S
-- grep EQU $< | tr -d '$$\#' $(ADS2GAS) > $@
-+ grep -w EQU $< | tr -d '$$\#' $(ADS2GAS) > $@
- $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S: $(VP8_PREFIX)encoder/asm_enc_offsets.c
- CLEAN-OBJS += $(BUILD_PFX)asm_enc_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S
-
- $(BUILD_PFX)asm_dec_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S
-- grep EQU $< | tr -d '$$\#' $(ADS2GAS) > $@
-+ grep -w EQU $< | tr -d '$$\#' $(ADS2GAS) > $@
- $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S: $(VP8_PREFIX)decoder/asm_dec_offsets.c
- CLEAN-OBJS += $(BUILD_PFX)asm_dec_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S
- else
diff --git a/multimedia/libvpx/patches/patch-ac b/multimedia/libvpx/patches/patch-ac
index 2d63ea5d502..eda40503bd7 100644
--- a/multimedia/libvpx/patches/patch-ac
+++ b/multimedia/libvpx/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2011/08/07 17:20:09 ryoon Exp $
+$NetBSD: patch-ac,v 1.3 2012/01/31 11:53:52 ryoon Exp $
---- examples.mk.orig 2011-08-04 17:30:15.000000000 +0000
+--- examples.mk.orig 2012-01-27 18:36:39.000000000 +0000
+++ examples.mk
-@@ -167,7 +167,7 @@ BINS-$(NOT_MSVS) += $(addprefi
+@@ -178,7 +178,7 @@ BINS-$(NOT_MSVS) += $(addprefi
# Instantiate linker template for all examples.
CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index 769d9ffdc3b..e1754f8e0a5 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.4 2011/08/07 17:20:09 ryoon Exp $
+$NetBSD: patch-ad,v 1.5 2012/01/31 11:53:52 ryoon Exp $
*BSD and qnx are identified as linux.
---- build/make/configure.sh.orig 2011-08-04 17:30:15.000000000 +0000
+--- build/make/configure.sh.orig 2012-01-27 18:36:39.000000000 +0000
+++ build/make/configure.sh
-@@ -562,7 +562,7 @@ process_common_toolchain() {
+@@ -573,7 +573,7 @@ process_common_toolchain() {
[ -z "$tgt_isa" ] && tgt_isa=x86
tgt_os=win32
;;
@@ -13,10 +13,10 @@ $NetBSD: patch-ad,v 1.4 2011/08/07 17:20:09 ryoon Exp $
tgt_os=linux
;;
*solaris2.10)
-@@ -970,10 +970,29 @@ EOF
- if enabled multithread; then
+@@ -1019,10 +1019,29 @@ EOF
case ${toolchain} in
*-win*);;
+ *-android-gcc);;
- *) check_header pthread.h && add_extralibs -lpthread
+ *) check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
esac
@@ -24,21 +24,21 @@ $NetBSD: patch-ad,v 1.4 2011/08/07 17:20:09 ryoon Exp $
+ case ${tgt_os} in
+ darwin*)
-+ add_extralibs -lm
-+ ;;
++ add_extralibs -lm
++ ;;
+ solaris*)
-+ add_extralibs -lm -lrt
-+ ;;
-+ linux*)
-+ case ${gcctarget} in
-+ *qnx6*)
-+ add_extralibs -lm
-+ ;;
-+ *)
-+ add_extralibs -lm -lrt
-+ ;;
-+ esac
-+ ;;
++ add_extralibs -lm -lrt
++ ;;
++ linux*)
++ case ${gcctarget} in
++ *qnx6*)
++ add_extralibs -lm
++ ;;
++ *)
++ add_extralibs -lm -lrt
++ ;;
++ esac
++ ;;
+ esac
+
# for sysconf(3) and friends.
diff --git a/multimedia/libvpx/patches/patch-ae b/multimedia/libvpx/patches/patch-ae
deleted file mode 100644
index fe287c60c71..00000000000
--- a/multimedia/libvpx/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2011/08/07 17:20:09 ryoon Exp $
-
-Fix build under Mac OS X Snow Leopard if the Mac OS X Leopard SDK
-is not installed.
-
---- configure.orig 2011-08-04 17:30:15.000000000 +0000
-+++ configure
-@@ -107,6 +107,7 @@ all_platforms="${all_platforms} x86-darw
- all_platforms="${all_platforms} x86-darwin8-icc"
- all_platforms="${all_platforms} x86-darwin9-gcc"
- all_platforms="${all_platforms} x86-darwin9-icc"
-+all_platforms="${all_platforms} x86-darwin10-gcc"
- all_platforms="${all_platforms} x86-linux-gcc"
- all_platforms="${all_platforms} x86-linux-icc"
- all_platforms="${all_platforms} x86-solaris-gcc"
diff --git a/multimedia/libvpx/patches/patch-af b/multimedia/libvpx/patches/patch-af
index d3986941eb3..501435e2624 100644
--- a/multimedia/libvpx/patches/patch-af
+++ b/multimedia/libvpx/patches/patch-af
@@ -1,7 +1,13 @@
-$NetBSD: patch-af,v 1.1 2011/09/14 17:22:44 hans Exp $
+$NetBSD: patch-af,v 1.2 2012/01/31 11:53:52 ryoon Exp $
---- examples/gen_example_code.sh.orig 2011-03-04 21:40:37.000000000 +0100
-+++ examples/gen_example_code.sh 2011-04-08 16:28:11.822549731 +0200
+--- examples/gen_example_code.sh.orig 2012-01-27 18:36:39.000000000 +0000
++++ examples/gen_example_code.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/pkg/bin/bash
+ ##
+ ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ ##
@@ -80,6 +80,6 @@ while IFS=$'\n' read -r line; do
|| include_block < "${template%.c}.txt" \
#|| echo "WARNING: failed to find text for block $block_name" >&2
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 08:42:52 +0000