aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2014-12-10 15:47:19 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2014-12-10 15:47:19 +0000
commitc3f4f7709e7fe4d59128f8600d9044da77b5152b (patch)
tree5708f32e8031431e44f287274d2c8549203ae96b /multimedia
parent20a49985420007ffc965984b3c0de20999180bbb (diff)
downloadports-c3f4f7709e7fe4d59128f8600d9044da77b5152b.tar.gz
ports-c3f4f7709e7fe4d59128f8600d9044da77b5152b.zip
Notes
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libvpx/Makefile4
-rw-r--r--multimedia/libvpx/files/extra-patch-build_make_Makefile11
-rw-r--r--multimedia/libvpx/files/patch-build_make_configure.sh10
3 files changed, 25 insertions, 0 deletions
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 16315d1225c5..5c071c8127c2 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -23,6 +23,7 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= DEBUG POSTPROC RUNTIME THREADS SHARED
OPTIONS_DEFAULT= POSTPROC RUNTIME THREADS SHARED
+OPTIONS_EXCLUDE_armv6= RUNTIME
POSTPROC_DESC= Enable postprocessing
RUNTIME_DESC= Enable runtime CPU detection
SHARED_DESC= Enable shared-library support
@@ -74,6 +75,9 @@ CONFIGURE_ARGS+= --target=ia64-linux-gcc
CONFIGURE_ARGS+= --target=ppc32-linux-gcc
.elif ${ARCH} == "powerpc64"
CONFIGURE_ARGS+= --target=ppc64-linux-gcc
+.elif ${ARCH} == "armv6"
+CONFIGURE_ARGS+= --target=armv6-linux-gcc --cpu=armv6
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-build_make_Makefile
.else
IGNORE= no support for ${ARCH} the moment. testing/patches are welcome
.endif
diff --git a/multimedia/libvpx/files/extra-patch-build_make_Makefile b/multimedia/libvpx/files/extra-patch-build_make_Makefile
new file mode 100644
index 000000000000..d66d97da32e3
--- /dev/null
+++ b/multimedia/libvpx/files/extra-patch-build_make_Makefile
@@ -0,0 +1,11 @@
+--- build/make/Makefile.orig 2013-11-18 22:18:52 UTC
++++ build/make/Makefile
+@@ -68,7 +68,7 @@ BUILD_ROOT?=.
+ VPATH=$(SRC_PATH_BARE)
+ CFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT) -I$(SRC_PATH)
+ CXXFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT) -I$(SRC_PATH)
+-ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/
++ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/ -meabi=5
+ DIST_DIR?=dist
+ HOSTCC?=gcc
+ TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN)))
diff --git a/multimedia/libvpx/files/patch-build_make_configure.sh b/multimedia/libvpx/files/patch-build_make_configure.sh
index eb84684c6b06..3744618cef45 100644
--- a/multimedia/libvpx/files/patch-build_make_configure.sh
+++ b/multimedia/libvpx/files/patch-build_make_configure.sh
@@ -1,3 +1,13 @@
+--- build/make/configure.sh.orig 2014-11-27 18:00:48 UTC
++++ build/make/configure.sh
+@@ -799,7 +799,6 @@ process_common_toolchain() {
+
+ case ${tgt_cc} in
+ gcc)
+- CROSS=${CROSS:-arm-none-linux-gnueabi-}
+ link_with_cc=gcc
+ setup_gnu_toolchain
+ arch_int=${tgt_isa##armv}
$FreeBSD$
--- build/make/configure.sh.orig 2014-12-03 18:11:14.000000000 +0100