Wed Sep 11 15:50:32 2013 UTC ()
Update to 1.2.0

* Buildlink to devel/googletest to test-libvpx (not installed and not tested).

Changelog:
2012-12-21 v1.2.0
  This release acts as a checkpoint for a large amount of internal refactoring
  and testing. It also contains a number of small bugfixes, so all users are
  encouraged to upgrade.

  - Upgrading:
    This release is ABI and API compatible with Duclair (v1.0.0). Users
    of older releases should refer to the Upgrading notes in this
    document for that release.

  - Enhancements:
      VP8 optimizations for MIPS dspr2
      vpxenc: add -quiet option

  - Speed:
      Encoder and decoder speed is consistent with the Eider release.

  - Quality:
      In general, quality is consistent with the Eider release.

      Minor tweaks to ARNR filtering
      Minor improvements to real time encoding with multiple temporal layers

  - Bug Fixes:
      Fixes multithreaded encoder race condition in loopfilter
      Fixes multi-resolution threaded encoding
      Fix potential encoder dead-lock after picture resize


(ryoon)
diff -r1.20 -r1.21 pkgsrc/multimedia/libvpx/Makefile
diff -r1.17 -r1.18 pkgsrc/multimedia/libvpx/distinfo
diff -r1.5 -r1.6 pkgsrc/multimedia/libvpx/patches/patch-aa
diff -r1.8 -r1.9 pkgsrc/multimedia/libvpx/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh
cvs diff -r1.20 -r1.21 pkgsrc/multimedia/libvpx/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/Makefile 2013/05/31 12:41:31 1.20
+++ pkgsrc/multimedia/libvpx/Makefile 2013/09/11 15:50:32 1.21
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.20 2013/05/31 12:41:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2013/09/11 15:50:32 ryoon Exp $
2 2
3DISTNAME= libvpx-v1.1.0 3DISTNAME= libvpx-v1.2.0
4PKGNAME= ${DISTNAME:S/-v/-/} 4PKGNAME= ${DISTNAME:S/-v/-/}
5PKGREVISION= 3 
6CATEGORIES= multimedia 5CATEGORIES= multimedia
7MASTER_SITES= http://webm.googlecode.com/files/ 6MASTER_SITES= http://webm.googlecode.com/files/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= http://code.google.com/p/webm/ 10HOMEPAGE= http://code.google.com/p/webm/
12COMMENT= On2 VP8 library from Google 11COMMENT= On2 VP8 library from Google
13LICENSE= modified-bsd 12LICENSE= modified-bsd
14 13
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17USE_TOOLS+= gmake bash:build perl:build 16USE_TOOLS+= gmake bash:build perl:build
18HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
@@ -64,15 +63,16 @@ CONFIGURE_ARGS+= --target=x86_64-darwin8 @@ -64,15 +63,16 @@ CONFIGURE_ARGS+= --target=x86_64-darwin8
64. endif 63. endif
65. endif 64. endif
66.endif 65.endif
67 66
68.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} 67.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH}
69CONFIGURE_ARGS+= --target=mips32-linux-gcc 68CONFIGURE_ARGS+= --target=mips32-linux-gcc
70.endif 69.endif
71 70
72BUILD_TARGET= # none 71BUILD_TARGET= # none
73 72
74post-extract: 73post-extract:
75 ${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC} 74 ${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC}
76 75
 76.include "../../devel/googletest/buildlink3.mk"
77.include "../../mk/pthread.buildlink3.mk" 77.include "../../mk/pthread.buildlink3.mk"
78.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/multimedia/libvpx/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/distinfo 2013/09/09 20:42:00 1.17
+++ pkgsrc/multimedia/libvpx/distinfo 2013/09/11 15:50:32 1.18
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.17 2013/09/09 20:42:00 wiz Exp $ 1$NetBSD: distinfo,v 1.18 2013/09/11 15:50:32 ryoon Exp $
2 2
3SHA1 (libvpx-v1.1.0.tar.bz2) = 356af5f770c50cd021c60863203d8f30164f6021 3SHA1 (libvpx-v1.2.0.tar.bz2) = 33fb2df4ee5b06637dc492dafe49425ead117a24
4RMD160 (libvpx-v1.1.0.tar.bz2) = 6f462c1421a51af77d3401ea4c1eaf0dbeaf4791 4RMD160 (libvpx-v1.2.0.tar.bz2) = ed43d99dd4a0166baf9caca7a50841ced695eb08
5Size (libvpx-v1.1.0.tar.bz2) = 1653485 bytes 5Size (libvpx-v1.2.0.tar.bz2) = 1715462 bytes
6SHA1 (patch-aa) = 088d405d598800d4587eb20647347db1490a29f2 6SHA1 (patch-aa) = 5b18ef2471039e2b3f9ba7818ed9372d03662cdd
7SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b 7SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b
8SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3 8SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3
9SHA1 (patch-ad) = b8f64861bd03599bcc1db52ea970d8eb20331a33 9SHA1 (patch-ad) = 274dc555219811c72b1f4a3298a0e9b1b300d169
10SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3 10SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
11SHA1 (patch-build_make_gen_asm_deps.sh) = 907d0a95ae4c5a8804354a85820eadf0858b62b7 11SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
12SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe 12SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/libvpx/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/patches/Attic/patch-aa 2012/02/02 12:32:43 1.5
+++ pkgsrc/multimedia/libvpx/patches/Attic/patch-aa 2013/09/11 15:50:32 1.6
@@ -1,112 +1,110 @@ @@ -1,112 +1,110 @@
1$NetBSD: patch-aa,v 1.5 2012/02/02 12:32:43 ryoon Exp $ 1$NetBSD: patch-aa,v 1.6 2013/09/11 15:50:32 ryoon Exp $
2 2
3--- build/make/Makefile.orig 2012-01-27 18:36:39.000000000 +0000 3--- build/make/Makefile.orig 2013-09-04 18:49:22.000000000 +0000
4+++ build/make/Makefile 4+++ build/make/Makefile
5@@ -106,16 +106,16 @@ $(BUILD_PFX)%.c.d: %.c 5@@ -110,7 +110,7 @@ $(BUILD_PFX)%.c.d: %.c
6  6
7 $(BUILD_PFX)%.c.o: %.c 7 $(BUILD_PFX)%.c.o: %.c
8 $(if $(quiet),@echo " [CC] $@") 8 $(if $(quiet),@echo " [CC] $@")
9- $(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $< 9- $(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
10+ $(qexec)${LIBTOOL} --mode=compile $(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $< 10+ $(qexec)${LIBTOOL} --mode=compile $(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
11  11
12 $(BUILD_PFX)%.cc.d: %.cc 12 $(BUILD_PFX)%.cc.d: %.cc
13 $(if $(quiet),@echo " [DEP] $@") 13 $(if $(quiet),@echo " [DEP] $@")
14 $(qexec)mkdir -p $(dir $@) 14@@ -119,7 +119,7 @@ $(BUILD_PFX)%.cc.d: %.cc
15- $(qexec)g++ $(INTERNAL_CFLAGS) $(CFLAGS) -M $< | $(fmt_deps) > $@ 
16+ $(qexec)${CXX} $(INTERNAL_CFLAGS) $(CFLAGS) -M $< | $(fmt_deps) > $@ 
17  15
18 $(BUILD_PFX)%.cc.o: %.cc 16 $(BUILD_PFX)%.cc.o: %.cc
19 $(if $(quiet),@echo " [CXX] $@") 17 $(if $(quiet),@echo " [CXX] $@")
20- $(qexec)g++ $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $< 18- $(qexec)$(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
21+ $(qexec)${LIBTOOL} --mode=compile ${CXX} $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $< 19+ $(qexec)${LIBTOOL} --mode=compile $(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
22  20
23 $(BUILD_PFX)%.asm.d: %.asm 21 $(BUILD_PFX)%.asm.d: %.asm
24 $(if $(quiet),@echo " [DEP] $@") 22 $(if $(quiet),@echo " [DEP] $@")
25@@ -125,7 +125,8 @@ $(BUILD_PFX)%.asm.d: %.asm 23@@ -129,7 +129,8 @@ $(BUILD_PFX)%.asm.d: %.asm
26  24
27 $(BUILD_PFX)%.asm.o: %.asm 25 $(BUILD_PFX)%.asm.o: %.asm
28 $(if $(quiet),@echo " [AS] $@") 26 $(if $(quiet),@echo " [AS] $@")
29- $(qexec)$(AS) $(ASFLAGS) -o $@ $< 27- $(qexec)$(AS) $(ASFLAGS) -o $@ $<
30+ $(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \ 28+ $(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \
31+ $(AS) $(ASFLAGS) -o $@ $< 29+ $(AS) $(ASFLAGS) -o $@ $<
32  30
33 $(BUILD_PFX)%.s.d: %.s 31 $(BUILD_PFX)%.s.d: %.s
34 $(if $(quiet),@echo " [DEP] $@") 32 $(if $(quiet),@echo " [DEP] $@")
35@@ -207,13 +208,15 @@ define linker_template 33@@ -211,13 +212,15 @@ define linker_template
36 $(1): $(filter-out -%,$(2)) 34 $(1): $(filter-out -%,$(2))
37 $(1): 35 $(1):
38 $(if $(quiet),@echo " [LD] $$@") 36 $(if $(quiet),@echo " [LD] $$@")
39- $(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs)) 37- $(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
40+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $$@ \ 38+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $$@ \
41+ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs) 39+ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
42 endef 40 endef
43 define linkerxx_template 41 define linkerxx_template
44 $(1): $(filter-out -%,$(2)) 42 $(1): $(filter-out -%,$(2))
45 $(1): 43 $(1):
46 $(if $(quiet),@echo " [LD] $$@") 44 $(if $(quiet),@echo " [LD] $$@")
47- $(qexec)g++ $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs)) 45- $(qexec)$$(CXX) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
48+ $(qexec)${LIBTOOL} --mode=link ${CXX} $(LDFLAGS) -o $$@ \ 46+ $(qexec)${LIBTOOL} --mode=link ${CXX} $(LDFLAGS) -o $$@ \
49+ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs) 47+ $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
50 endef 48 endef
51 # make-3.80 has a bug with expanding large input strings to the eval function, 49 # make-3.80 has a bug with expanding large input strings to the eval function,
52 # which was triggered in some cases by the following component of 50 # which was triggered in some cases by the following component of
53@@ -226,8 +229,12 @@ endef 51@@ -230,8 +233,12 @@ endef
54 define install_map_template 52 define install_map_template
55 $(DIST_DIR)/$(1): $(2) 53 $(DIST_DIR)/$(1): $(2)
56 $(if $(quiet),@echo " [INSTALL] $$@") 54 $(if $(quiet),@echo " [INSTALL] $$@")
57- $(qexec)mkdir -p $$(dir $$@) 55- $(qexec)mkdir -p $$(dir $$@)
58- $(qexec)cp -p $$< $$@ 56- $(qexec)cp -p $$< $$@
59+ $(qexec)${BSD_INSTALL_DATA} -d -m 755 $$(dir $$@) 57+ $(qexec)${BSD_INSTALL_DATA} -d -m 755 $$(dir $$@)
60+ $$(if $$(filter %.a,$$<), \ 58+ $$(if $$(filter %.a,$$<), \
61+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c $$(patsubst %.a,%.la,$$<) $$(dir $$@), \ 59+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c $$(patsubst %.a,%.la,$$<) $$(dir $$@), \
62+ $$(if $$(filter %.h %.pc,$$<), \ 60+ $$(if $$(filter %.h %.pc,$$<), \
63+ ${BSD_INSTALL_DATA} -c -m 644 $$< $$(dir $$@), \ 61+ ${BSD_INSTALL_DATA} -c -m 644 $$< $$(dir $$@), \
64+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c -s $$< $$(dir $$@))) 62+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c -s $$< $$(dir $$@)))
65 endef 63 endef
66  64
67 define archive_template 65 define archive_template
68@@ -236,7 +243,9 @@ define archive_template 66@@ -240,7 +247,9 @@ define archive_template
69 # for creating them. 67 # for creating them.
70 $(1): 68 $(1):
71 $(if $(quiet),@echo " [AR] $$@") 69 $(if $(quiet),@echo " [AR] $$@")
72- $(qexec)$$(AR) $$(ARFLAGS) $$@ $$? 70- $(qexec)$$(AR) $$(ARFLAGS) $$@ $$?
73+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -Wl,-Bsymbolic -o $$(patsubst %.a,%.la,$$@) \ 71+ $(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -Wl,-Bsymbolic -o $$(patsubst %.a,%.la,$$@) \
74+ $$(patsubst %.o,%.lo,$$?) -rpath $(PREFIX)/lib $$(extralibs) \ 72+ $$(patsubst %.o,%.lo,$$?) -rpath $(PREFIX)/lib $$(extralibs) \
75+ -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_PATCH) 73+ -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_PATCH)
76 endef 74 endef
77  75
78 define so_template 76 define so_template
79@@ -313,20 +322,20 @@ clean:: 77@@ -317,20 +326,20 @@ clean::
80 rm -f .bins .install-bins $(BINS) 78 rm -f .bins .install-bins $(BINS)
81  79
82 LIBS=$(call enabled,LIBS) 80 LIBS=$(call enabled,LIBS)
83-.libs: $(LIBS) 81-.libs: $(LIBS)
84+dot.libs: $(LIBS) 82+dot.libs: $(LIBS)
85 @touch $@ 83 @touch $@
86-$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib)))) 84-$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
87+$(foreach lib,$(filter %.a,$(LIBS)),$(eval $(call archive_template,$(lib)))) 85+$(foreach lib,$(filter %.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
88 $(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib)))) 86 $(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
89  87
90 INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS) 88 INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)
91 ifeq ($(MAKECMDGOALS),dist) 89 ifeq ($(MAKECMDGOALS),dist)
92 INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS) 90 INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS)
93 endif 91 endif
94-.install-libs: .libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS)) 92-.install-libs: .libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS))
95+.install-libs: dot.libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS)) 93+.install-libs: dot.libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS))
96 @touch $@ 94 @touch $@
97  95
98 clean:: 96 clean::
99- rm -f .libs .install-libs $(LIBS) 97- rm -f .libs .install-libs $(LIBS)
100+ rm -f dot.libs .install-libs $(LIBS) 98+ rm -f dot.libs .install-libs $(LIBS)
101  99
102 ifeq ($(CONFIG_EXTERNAL_BUILD),yes) 100 ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
103 PROJECTS=$(call enabled,PROJECTS) 101 PROJECTS=$(call enabled,PROJECTS)
104@@ -376,7 +385,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes) 102@@ -380,7 +389,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
105 BUILD_TARGETS += .projects 103 BUILD_TARGETS += .projects
106 INSTALL_TARGETS += .install-projects 104 INSTALL_TARGETS += .install-projects
107 endif 105 endif
108-BUILD_TARGETS += .docs .libs .bins 106-BUILD_TARGETS += .docs .libs .bins
109+BUILD_TARGETS += .docs dot.libs .bins 107+BUILD_TARGETS += .docs dot.libs .bins
110 INSTALL_TARGETS += .install-docs .install-srcs .install-libs .install-bins 108 INSTALL_TARGETS += .install-docs .install-srcs .install-libs .install-bins
111 all: $(BUILD_TARGETS) 109 all: $(BUILD_TARGETS)
112 install:: $(INSTALL_TARGETS) 110 install:: $(INSTALL_TARGETS)
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/libvpx/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/patches/Attic/patch-ad 2012/12/23 10:33:34 1.8
+++ pkgsrc/multimedia/libvpx/patches/Attic/patch-ad 2013/09/11 15:50:32 1.9
@@ -1,70 +1,56 @@ @@ -1,70 +1,56 @@
1$NetBSD: patch-ad,v 1.8 2012/12/23 10:33:34 ryoon Exp $ 1$NetBSD: patch-ad,v 1.9 2013/09/11 15:50:32 ryoon Exp $
2 2
3*BSD and qnx are identified as linux. 3*BSD and qnx are identified as linux.
4Add another SDK path on Mac OS X. 4Add another SDK path on Mac OS X.
5 5
6--- build/make/configure.sh.orig 2012-05-08 23:14:00.000000000 +0000 6--- build/make/configure.sh.orig 2013-09-04 18:49:22.000000000 +0000
7+++ build/make/configure.sh 7+++ build/make/configure.sh
8@@ -596,7 +596,7 @@ process_common_toolchain() { 8@@ -645,7 +645,7 @@ process_common_toolchain() {
9 [ -z "$tgt_isa" ] && tgt_isa=x86 9 [ -z "$tgt_isa" ] && tgt_isa=x86
10 tgt_os=win32 10 tgt_os=win32
11 ;; 11 ;;
12- *linux*|*bsd*) 12- *linux*|*bsd*)
13+ *linux*|*bsd*|*qnx6*) 13+ *linux*|*bsd*|*qnx6*)
14 tgt_os=linux 14 tgt_os=linux
15 ;; 15 ;;
16 *solaris2.10) 16 *solaris2.10)
17@@ -656,6 +656,9 @@ process_common_toolchain() { 17@@ -960,8 +960,6 @@ process_common_toolchain() {
18 if [ -d "${OSX_SDK_ROOTS}/${v}" ]; then 18 check_add_cflags -mips32r2 -mdspr2
19 osx_sdk_dir="${OSX_SDK_ROOTS}/${v}" 19 disable fast_unaligned
20 fi 20 fi
21+ if [ -d "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" ]; then 
22+ osx_sdk_dir="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" 
23+ fi 
24 done 
25 fi 
26 ;; 
27@@ -890,12 +893,9 @@ process_common_toolchain() { 
28 esac 
29 ;; 
30 mips*) 
31- CROSS=${CROSS:-mipsel-linux-uclibc-} 
32 link_with_cc=gcc 
33 setup_gnu_toolchain 
34 tune_cflags="-mtune=" 
35- check_add_cflags -march=${tgt_isa} 21- check_add_cflags -march=${tgt_isa}
36- check_add_asflags -march=${tgt_isa} 22- check_add_asflags -march=${tgt_isa}
37 check_add_asflags -KPIC 23 check_add_asflags -KPIC
38 ;; 24 ;;
39 ppc*) 25 ppc*)
40@@ -1082,10 +1082,29 @@ EOF 26@@ -1160,10 +1158,29 @@ EOF
41 case ${toolchain} in 27 case ${toolchain} in
42 *-win*);; 28 *-win*-vs*);;
43 *-android-gcc);; 29 *-android-gcc);;
44- *) check_header pthread.h && add_extralibs -lpthread 30- *) check_header pthread.h && add_extralibs -lpthread
45+ *) check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 31+ *) check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
46 esac 32 esac
47 fi 33 fi
48  34
49+ case ${tgt_os} in 35+ case ${tgt_os} in
50+ darwin*) 36+ darwin*)
51+ add_extralibs -lm 37+ add_extralibs -lm
52+ ;; 38+ ;;
53+ solaris*) 39+ solaris*)
54+ add_extralibs -lm -lrt 40+ add_extralibs -lm -lrt
55+ ;; 41+ ;;
56+ linux*) 42+ linux*)
57+ case ${gcctarget} in 43+ case ${gcctarget} in
58+ *qnx6*) 44+ *qnx6*)
59+ add_extralibs -lm 45+ add_extralibs -lm
60+ ;; 46+ ;;
61+ *) 47+ *)
62+ add_extralibs -lm -lrt 48+ add_extralibs -lm -lrt
63+ ;; 49+ ;;
64+ esac 50+ esac
65+ ;; 51+ ;;
66+ esac 52+ esac
67+ 53+
68 # for sysconf(3) and friends. 54 # only for MIPS platforms
69 check_header unistd.h 55 case ${toolchain} in
70  56 mips*)
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/libvpx/patches/Attic/patch-build_make_gen_asm_deps.sh (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/patches/Attic/patch-build_make_gen_asm_deps.sh 2013/01/24 10:22:08 1.1
+++ pkgsrc/multimedia/libvpx/patches/Attic/patch-build_make_gen_asm_deps.sh 2013/09/11 15:50:32 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-build_make_gen_asm_deps.sh,v 1.1 2013/01/24 10:22:08 tron Exp $ 1$NetBSD: patch-build_make_gen_asm_deps.sh,v 1.2 2013/09/11 15:50:32 ryoon Exp $
2 2
3Fix build problems under Mac OS X with Xcode 4.4 and newer. Patch 3Fix build problems under Mac OS X with Xcode 4.4 and newer. Patch
4taken from here: 4taken from here:
5 5
6https://github.com/mxcl/homebrew/issues/12567#issuecomment-6434000 6https://github.com/mxcl/homebrew/issues/12567#issuecomment-6434000
7 7
8--- build/make/gen_asm_deps.sh.old 2012-05-09 00:14:00.000000000 +0100 8--- build/make/gen_asm_deps.sh.orig 2013-09-04 18:49:22.000000000 +0000
9+++ build/make/gen_asm_deps.sh 2013-01-24 10:02:54.000000000 +0000 9+++ build/make/gen_asm_deps.sh
10@@ -42,7 +42,7 @@ 10@@ -42,7 +42,7 @@ done
11  11
12 [ -n "$srcfile" ] || show_help 12 [ -n "$srcfile" ] || show_help
13 sfx=${sfx:-asm} 13 sfx=${sfx:-asm}
14-includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile | 14-includes=$(LC_ALL=C egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
15+includes=$(LC_ALL=C egrep -i "include +\"[a-z0-9_/]+\.${sfx}" $srcfile | 15+includes=$(LC_ALL=C egrep -i "include +\"[a-z0-9_/]+\.${sfx}" $srcfile |
16 perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;") 16 perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
17 #" restore editor state 17 #" restore editor state
18 for inc in ${includes}; do 18 for inc in ${includes}; do