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

Revert to version 1.6.1: newer versions require __atomic builtins

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2018-02-16 14:46:50 +00:00
parent e1342d8ede
commit 28701516e9
5 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
multimedia/libvpx/Makefile
View File

@ -1,14 +1,15 @@
# $OpenBSD: Makefile,v 1.34 2018/02/10 23:56:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.35 2018/02/16 14:46:50 ajacoutot Exp $
COMMENT= Google VP8/VP9 video codec
VER= 1.7.0
# XXX newer version requires __atomic builtins
DISTNAME= libvpx-1.6.1
CATEGORIES= multimedia
GH_ACCOUNT= webmproject
GH_PROJECT= libvpx
GH_TAGNAME= v${VER}
MASTER_SITES= https://storage.googleapis.com/downloads.webmproject.org/releases/webm/
EXTRACT_SUFX= .tar.bz2
EPOCH= 0
SHARED_LIBS= vpx 9.0
SHARED_LIBS= vpx 10.0
HOMEPAGE= https://www.webmproject.org/

4
multimedia/libvpx/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libvpx-1.7.0.tar.gz) = H+yTHrXJQnmtIZpbbgICNY6UqTqQz7FgNXjDJqv8Ejg=
SIZE (libvpx-1.7.0.tar.gz) = 2679797
SHA256 (libvpx-1.6.1.tar.bz2) = HCwMKpf7qUdJQ7407jkzfe51Z4D8EocLodxoNyWGqBk=
SIZE (libvpx-1.6.1.tar.bz2) = 1959534

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

@ -1,8 +1,8 @@
$OpenBSD: patch-build_make_Makefile,v 1.10 2018/02/10 23:56:10 ajacoutot Exp $
$OpenBSD: patch-build_make_Makefile,v 1.11 2018/02/16 14:46:50 ajacoutot Exp $
Index: build/make/Makefile
--- build/make/Makefile.orig
+++ build/make/Makefile
@@ -301,8 +301,7 @@ define so_template
@@ -294,8 +294,7 @@ define so_template
# This needs further abstraction for dealing with non-GNU linkers.
$(1):
$(if $(quiet),@echo " [LD] $$@")
@ -12,7 +12,7 @@ Index: build/make/Makefile
-Wl,--version-script,$$(EXPORTS_FILE) -o $$@ \
$$(filter %.o,$$^) $$(extralibs)
endef
@@ -387,7 +386,7 @@ LIBS=$(call enabled,LIBS)
@@ -380,7 +379,7 @@ LIBS=$(call enabled,LIBS)
.libs: $(LIBS)
@touch $@
$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))

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

@ -1,25 +1,16 @@
$OpenBSD: patch-configure,v 1.14 2018/02/10 23:56:10 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.15 2018/02/16 14:46:50 ajacoutot Exp $
Index: configure
--- configure.orig
+++ configure
@@ -116,6 +116,7 @@ all_platforms="${all_platforms} mips32-linux-gcc"
@@ -113,6 +113,7 @@ all_platforms="${all_platforms} armv7s-darwin-gcc"
all_platforms="${all_platforms} armv8-linux-gcc"
all_platforms="${all_platforms} mips32-linux-gcc"
all_platforms="${all_platforms} mips64-linux-gcc"
all_platforms="${all_platforms} ppc64-linux-gcc"
all_platforms="${all_platforms} ppc64le-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"
@@ -170,7 +171,7 @@ for t in ${all_targets}; do
[ -f "${source_path}/${t}.mk" ] && enable_feature ${t}
done
-if ! diff --version >/dev/null; then
+if ! hash diff >/dev/null; then
die "diff missing: Try installing diffutils via your package manager."
fi
@@ -185,19 +186,6 @@ if [ "`cd \"${source_path}\" && pwd`" != "`pwd`" ]; th
@@ -175,19 +176,6 @@ if [ "`cd \"${source_path}\" && pwd`" != "`pwd`" ]; th
fi
fi
@ -39,7 +30,7 @@ Index: configure
# disable codecs when their source directory does not exist
[ -d "${source_path}/vp8" ] || disable_codec vp8
[ -d "${source_path}/vp9" ] || disable_codec vp9
@@ -518,7 +506,7 @@ process_detect() {
@@ -496,7 +484,7 @@ process_detect() {
# here rather than at option parse time because the target auto-detect
# magic happens after the command line has been parsed.
case "${tgt_os}" in

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

@ -1,4 +1,4 @@
$OpenBSD: patch-libs_mk,v 1.14 2018/02/10 23:56:10 ajacoutot Exp $
$OpenBSD: patch-libs_mk,v 1.15 2018/02/16 14:46:50 ajacoutot Exp $
Index: libs.mk
--- libs.mk.orig
+++ libs.mk
@ -13,7 +13,7 @@ Index: libs.mk
ifeq ($(CONFIG_MSVS),yes)
CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd)
@@ -256,22 +252,17 @@ EXPORT_FILE := libvpx.def
@@ -255,22 +251,17 @@ EXPORT_FILE := libvpx.def
LIBVPX_SO_SYMLINKS :=
LIBVPX_SO_IMPLIB := libvpx_dll.a
else
@ -37,7 +37,7 @@ Index: libs.mk
$(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
libvpx.ver: $(call enabled,CODEC_EXPORTS)
@@ -306,15 +297,7 @@ $(1): $(2)
@@ -305,15 +296,7 @@ $(1): $(2)
$(qexec)ln -sf $(2) $$@
endef