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

Patch syncing and comment tweaking in a patch.

Browse Source 
from Brad (maintainer).
This commit is contained in:
ajacoutot 2019-09-15 16:03:31 +00:00
parent 5ec3eae464
commit 64add751d6
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
$OpenBSD: patch-build_make_Makefile,v 1.13 2019/02/14 09:44:26 jca Exp $
$OpenBSD: patch-build_make_Makefile,v 1.14 2019/09/15 16:03:31 ajacoutot Exp $
Index: build/make/Makefile
--- build/make/Makefile.orig
+++ build/make/Makefile

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

@ -1,8 +1,9 @@
$OpenBSD: patch-configure,v 1.18 2019/02/14 09:44:26 jca Exp $
$OpenBSD: patch-configure,v 1.19 2019/09/15 16:03:31 ajacoutot Exp $
Index: configure
--- configure.orig
+++ configure
@@ -115,7 +115,9 @@ all_platforms="${all_platforms} armv7s-darwin-gcc"
@@ -114,7 +114,9 @@ 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"
@ -12,7 +13,7 @@ Index: configure
all_platforms="${all_platforms} sparc-solaris-gcc"
all_platforms="${all_platforms} x86-android-gcc"
all_platforms="${all_platforms} x86-darwin8-gcc"
@@ -166,7 +168,7 @@ for t in ${all_targets}; do
@@ -165,7 +167,7 @@ for t in ${all_targets}; do
[ -f "${source_path}/${t}.mk" ] && enable_feature ${t}
done
@ -21,7 +22,7 @@ Index: configure
die "diff missing: Try installing diffutils via your package manager."
fi
@@ -181,19 +183,6 @@ if [ "`cd \"${source_path}\" && pwd`" != "`pwd`" ]; th
@@ -180,19 +182,6 @@ if [ "`cd \"${source_path}\" && pwd`" != "`pwd`" ]; th
fi
fi
@ -41,7 +42,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 +507,7 @@ process_detect() {
@@ -526,7 +515,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

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

@ -1,8 +1,9 @@
$OpenBSD: patch-examples_mk,v 1.8 2019/02/14 09:44:26 jca Exp $
$OpenBSD: patch-examples_mk,v 1.9 2019/09/15 16:03:31 ajacoutot Exp $
Index: examples.mk
--- examples.mk.orig
+++ examples.mk
@@ -318,7 +318,7 @@ else
@@ -332,7 +332,7 @@ else
SHARED_LIB_SUF=.so
endif
endif

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

@ -1,8 +1,9 @@
$OpenBSD: patch-libs_mk,v 1.17 2019/02/14 09:44:26 jca Exp $
$OpenBSD: patch-libs_mk,v 1.18 2019/09/15 16:03:31 ajacoutot Exp $
Index: libs.mk
--- libs.mk.orig
+++ libs.mk
@@ -256,22 +256,17 @@ EXPORT_FILE := libvpx.def
@@ -255,22 +255,17 @@ EXPORT_FILE := libvpx.def
LIBVPX_SO_SYMLINKS :=
LIBVPX_SO_IMPLIB := libvpx_dll.a
else
@ -26,7 +27,7 @@ Index: libs.mk
$(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
libvpx.def: $(call enabled,CODEC_EXPORTS)
@@ -294,15 +289,7 @@ $(1): $(2)
@@ -293,15 +288,7 @@ $(1): $(2)
$(qexec)ln -sf $(2) $$@
endef

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

@ -1,15 +1,16 @@
$OpenBSD: patch-vpx_ports_arm_cpudetect_c,v 1.1 2018/10/17 08:22:29 ajacoutot Exp $
$OpenBSD: patch-vpx_ports_arm_cpudetect_c,v 1.2 2019/09/15 16:03:31 ajacoutot Exp $
Allow ARM CPU runtime detection code to build on OpenBSD.
Index: vpx_ports/arm_cpudetect.c
--- vpx_ports/arm_cpudetect.c.orig
+++ vpx_ports/arm_cpudetect.c
@@ -147,6 +147,19 @@ int arm_cpu_caps(void) {
@@ -147,7 +147,20 @@ int arm_cpu_caps(void) {
}
return flags & mask;
}
+#elif defined(__OpenBSD__)
-#else /* end __linux__ */
+#elif defined(__OpenBSD__) /* end __linux__ */
+int arm_cpu_caps(void) {
+ int flags;
+ int mask;
@ -22,6 +23,7 @@ Index: vpx_ports/arm_cpudetect.c
+#endif /* HAVE_NEON || HAVE_NEON_ASM */
+ return flags & mask;
+}
#else /* end __linux__ */
+#else /* end __OpenBSD__ */
#error \
"--enable-runtime-cpu-detect selected, but no CPU detection method " \
"available for your platform. Reconfigure with --disable-runtime-cpu-detect."