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

Update to libvpx 1.0.0.

Browse Source 
From brad, with tweaks by me.
This commit is contained in:
dcoppa 2012-02-28 12:28:29 +00:00
parent 2ec893b722
commit 995bcbc512
8 changed files with 71 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
multimedia/libvpx/Makefile
View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.7 2011/03/17 16:54:16 edd Exp $
# $OpenBSD: Makefile,v 1.8 2012/02/28 12:28:29 dcoppa Exp $
COMMENT= Google VP8 video codec
V= 0.9.6
V= 1.0.0
DISTNAME= libvpx-v${V}
PKGNAME= libvpx-${V}
CATEGORIES= multimedia
MASTER_SITES= http://webm.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= vpx 2.0
SHARED_LIBS= vpx 3.0
HOMEPAGE= http://www.webmproject.org/
@ -20,6 +20,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pthread
BUILD_DEPENDS+= shells/bash
@ -59,6 +60,8 @@ post-install:
@chmod ${SHAREMODE} ${PREFIX}/include/vpx/*.h
@chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lib*
@chmod ${SHAREMODE} ${PREFIX}/lib/lib*
@chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/pkgconfig/vpx.pc
@chmod ${SHAREMODE} ${PREFIX}/lib/pkgconfig/vpx.pc
.include <bsd.port.mk>

10
multimedia/libvpx/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libvpx-v0.9.6.tar.bz2) = OD8/B6dgmWgqu0P3m2krcg==
RMD160 (libvpx-v0.9.6.tar.bz2) = uFA4uS2RGymzuRLD1xxg4T+JpVE=
SHA1 (libvpx-v0.9.6.tar.bz2) = o1Ir0rc9Ujgbp2fe0cv0dg6cxvg=
SHA256 (libvpx-v0.9.6.tar.bz2) = KL2KjvIW+1cJEvDTeGaAUdmWgb8Tc1tZ5ooSrXnyqnM=
SIZE (libvpx-v0.9.6.tar.bz2) = 1230418
MD5 (libvpx-v1.0.0.tar.bz2) = 2Ye1FAQS7dN9LGsQwprUhA==
RMD160 (libvpx-v1.0.0.tar.bz2) = LuWi5/TLLxJsbQ2aNuhjZFX0KRU=
SHA1 (libvpx-v1.0.0.tar.bz2) = KRnhEHT+9y/GHvGnUWAFD/qtYHQ=
SHA256 (libvpx-v1.0.0.tar.bz2) = B87bChmkTm2B119S7qhk9Z7xDGxyXLhgQxvsZkHq/iE=
SIZE (libvpx-v1.0.0.tar.bz2) = 1641411

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

@ -1,7 +1,7 @@
$OpenBSD: patch-build_make_Makefile,v 1.1.1.1 2010/10/04 23:56:16 ckuethe Exp $
--- build/make/Makefile.orig Thu Sep 2 14:56:47 2010
+++ build/make/Makefile Sat Sep 25 16:48:26 2010
@@ -222,8 +222,7 @@ define so_template
$OpenBSD: patch-build_make_Makefile,v 1.2 2012/02/28 12:28:29 dcoppa 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
# 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.1.1.1 2010/10/04 23:56:16 ckuethe Exp $
-Wl,--version-script,$$(SO_VERSION_SCRIPT) -o $$@ \
$$(filter %.o,$$?) $$(extralibs)
endef
@@ -291,7 +290,7 @@ LIBS=$(call enabled,LIBS)
@@ -316,7 +315,7 @@ LIBS=$(call enabled,LIBS)
.libs: $(LIBS)
@touch $@
$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))

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

@ -1,25 +1,16 @@
$OpenBSD: patch-build_make_configure_sh,v 1.3 2011/03/17 16:54:16 edd Exp $
--- build/make/configure.sh.orig Fri Mar 4 15:40:37 2011
+++ build/make/configure.sh Tue Mar 8 21:12:29 2011
$OpenBSD: patch-build_make_configure_sh,v 1.4 2012/02/28 12:28:29 dcoppa Exp $
--- build/make/configure.sh.orig Fri Jan 27 13:36:39 2012
+++ build/make/configure.sh Sun Jan 29 21:13:12 2012
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${BASH}
##
## configure.sh
##
@@ -880,8 +880,6 @@ process_common_toolchain() {
esac
;;
gcc*)
- add_cflags -m${bits}
- add_ldflags -m${bits}
link_with_cc=gcc
tune_cflags="-march="
setup_gnu_toolchain
@@ -975,7 +973,7 @@ EOF
if enabled multithread; then
@@ -1019,7 +1019,7 @@ EOF
case ${toolchain} in
*-win*);;
*-android-gcc);;
- *) check_header pthread.h && add_extralibs -lpthread
+ *) check_header pthread.h && add_extralibs -pthread
esac

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

@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.5 2011/03/17 16:54:16 edd Exp $
--- configure.orig Fri Mar 4 15:40:37 2011
+++ configure Tue Mar 8 21:12:29 2011
$OpenBSD: patch-configure,v 1.6 2012/02/28 12:28:29 dcoppa Exp $
--- configure.orig Fri Jan 27 13:36:39 2012
+++ configure Sun Jan 29 21:11:03 2012
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${BASH}
##
## configure
##
@@ -100,6 +100,7 @@ all_platforms="${all_platforms} ppc32-linux-gcc"
@@ -101,6 +101,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.5 2011/03/17 16:54:16 edd Exp $
all_platforms="${all_platforms} sparc-solaris-gcc"
all_platforms="${all_platforms} x86-darwin8-gcc"
all_platforms="${all_platforms} x86-darwin8-icc"
@@ -132,19 +133,6 @@ for t in ${all_targets}; do
@@ -136,19 +137,6 @@ for t in ${all_targets}; do
[ -f ${source_path}/${t}.mk ] && enable ${t}
done
@ -35,7 +35,7 @@ $OpenBSD: patch-configure,v 1.5 2011/03/17 16:54:16 edd 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.
@@ -416,12 +404,6 @@ EOF
@@ -433,12 +421,6 @@ EOF
}
process_detect() {

12
multimedia/libvpx/patches/patch-examples_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-examples_mk,v 1.1 2012/02/28 12:28:29 dcoppa Exp $
--- examples.mk.orig Thu Feb 23 10:30:34 2012
+++ examples.mk Thu Feb 23 10:31:11 2012
@@ -178,7 +178,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)
$(foreach bin,$(BINS-yes),\
$(if $(BUILD_OBJS),$(eval $(bin):\
$(LIB_PATH)/lib$(CODEC_LIB)$(CODEC_LIB_SUF)))\

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

@ -1,15 +1,17 @@
$OpenBSD: patch-libs_mk,v 1.3 2011/03/17 16:54:16 edd Exp $
--- libs.mk.orig Fri Mar 4 15:40:39 2011
+++ libs.mk Tue Mar 8 21:12:29 2011
@@ -157,15 +157,11 @@ LIBS-$(BUILD_LIBVPX) += $(BUILD_PFX)libvpx.a $(BUILD_P
$OpenBSD: patch-libs_mk,v 1.4 2012/02/28 12:28:29 dcoppa Exp $
--- libs.mk.orig Fri Jan 27 13:36:39 2012
+++ libs.mk Thu Feb 23 15:00:49 2012
@@ -192,16 +192,11 @@ LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD
$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
BUILD_LIBVPX_SO := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))
-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)
+LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver
$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm -pthread
$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
-$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR)
$(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver
-LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
@ -18,11 +20,27 @@ $OpenBSD: patch-libs_mk,v 1.3 2011/03/17 16:54:16 edd Exp $
libvpx.ver: $(call enabled,CODEC_EXPORTS)
@echo " [CREATE] $@"
@@ -178,7 +174,6 @@ $(addprefix $(DIST_DIR)/,$(LIBVPX_SO_SYMLINKS)):
@echo " [LN] $@"
$(qexec)ln -sf $(LIBVPX_SO) $@
@@ -216,14 +211,6 @@ $(1): $(2)
$(qexec)ln -sf $(LIBVPX_SO) $$@
endef
-$(eval $(call libvpx_symlink_template,\
- $(addprefix $(BUILD_PFX),$(notdir $(LIBVPX_SO_SYMLINKS))),\
- $(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)
endif
LIBS-$(BUILD_LIBVPX) += vpx.pc
@@ -240,7 +227,7 @@ vpx.pc: config.mk libs.mk
$(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
$(qexec)echo 'Requires:' >> $@
$(qexec)echo 'Conflicts:' >> $@
- $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
+ $(qexec)echo 'Libs: -L$${libdir} -lvpx -pthread' >> $@
$(qexec)echo 'Cflags: -I$${includedir}' >> $@
INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc

5
multimedia/libvpx/pkg/PLIST
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2010/10/31 21:05:38 ckuethe Exp $
@comment $OpenBSD: PLIST,v 1.3 2012/02/28 12:28:29 dcoppa Exp $
%%SHARED%%
@bin bin/vp8_scalable_patterns
@bin bin/vpxdec
@bin bin/vpxenc
include/vpx/
@ -16,3 +17,5 @@ include/vpx/vpx_encoder.h
include/vpx/vpx_image.h
include/vpx/vpx_integer.h
lib/libvpx.a
lib/pkgconfig/
lib/pkgconfig/vpx.pc