From fb0cfcac89cf8f64b67bb26a10deb257ba4faa77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 3 Dec 2013 23:09:08 +0000 Subject: [PATCH] libvpx: update patchset for x86_64 --- media-libs/libvpx/patches/libvpx-1.0.0.patch | 66 ------------------- .../libvpx/patches/libvpx-1.0.0.patchset | 48 ++++++++++++-- 2 files changed, 42 insertions(+), 72 deletions(-) delete mode 100644 media-libs/libvpx/patches/libvpx-1.0.0.patch diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patch b/media-libs/libvpx/patches/libvpx-1.0.0.patch deleted file mode 100644 index da04b72ff..000000000 --- a/media-libs/libvpx/patches/libvpx-1.0.0.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ruN libvpx-v1.0.0/build/make/configure.sh libvpx-v1.0.0-haiku/build/make/configure.sh ---- libvpx-v1.0.0/build/make/configure.sh 2012-01-27 18:36:39.038535168 +0000 -+++ libvpx-v1.0.0-haiku/build/make/configure.sh 2012-03-14 00:47:54.780926976 +0000 -@@ -579,6 +579,9 @@ - *solaris2.10) - tgt_os=solaris - ;; -+ *haiku*) -+ tgt_os=haiku -+ ;; - esac - - if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then -@@ -909,8 +912,8 @@ - esac - ;; - gcc*) -- add_cflags -m${bits} -- add_ldflags -m${bits} -+ enabled haiku || add_cflags -m${bits} -+ enabled haiku || add_ldflags -m${bits} - link_with_cc=gcc - tune_cflags="-march=" - setup_gnu_toolchain -@@ -939,7 +942,7 @@ - add_asflags -f x64 - enabled debug && add_asflags -g cv8 - ;; -- linux*|solaris*) -+ linux*|solaris*|haiku*) - add_asflags -f elf${bits} - enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2 - enabled debug && [ "${AS}" = nasm ] && add_asflags -g -@@ -1019,6 +1022,7 @@ - case ${toolchain} in - *-win*);; - *-android-gcc);; -+ *-haiku*);; - *) check_header pthread.h && add_extralibs -lpthread - esac - fi -diff -ruN libvpx-v1.0.0/configure libvpx-v1.0.0-haiku/configure ---- libvpx-v1.0.0/configure 2012-01-27 18:36:39.039583744 +0000 -+++ libvpx-v1.0.0-haiku/configure 2012-03-14 00:46:37.182976512 +0000 -@@ -107,6 +107,7 @@ - all_platforms="${all_platforms} x86-darwin9-gcc" - all_platforms="${all_platforms} x86-darwin9-icc" - all_platforms="${all_platforms} x86-darwin10-gcc" -+all_platforms="${all_platforms} x86-haiku-gcc" - all_platforms="${all_platforms} x86-linux-gcc" - all_platforms="${all_platforms} x86-linux-icc" - all_platforms="${all_platforms} x86-solaris-gcc" -diff -ruN libvpx-v1.0.0/examples.mk libvpx-v1.0.0-haiku/examples.mk ---- libvpx-v1.0.0/examples.mk 2012-01-27 18:36:39.040108032 +0000 -+++ libvpx-v1.0.0-haiku/examples.mk 2012-03-14 00:46:37.187432960 +0000 -@@ -113,7 +113,9 @@ - # We should not link to math library (libm) on RVCT - # when building for bare-metal targets - ifeq ($(CONFIG_OS_SUPPORT), yes) --CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -+ ifneq ($(TOOLCHAIN),x86-haiku-gcc) -+ CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -+ endif - else - ifeq ($(CONFIG_GCC), yes) - CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patchset b/media-libs/libvpx/patches/libvpx-1.0.0.patchset index eba3dc397..24eb0181d 100644 --- a/media-libs/libvpx/patches/libvpx-1.0.0.patchset +++ b/media-libs/libvpx/patches/libvpx-1.0.0.patchset @@ -1,4 +1,4 @@ -From 0c31cfc2c7429f81129c3403d9bc03bd245db71c Mon Sep 17 00:00:00 2001 +From 98f5dcd5f2dba828f545dac2a534c90d0c5e6c53 Mon Sep 17 00:00:00 2001 From: korli Date: Wed, 14 Mar 2012 00:15:38 +0000 Subject: patch for 1.0.0 @@ -74,10 +74,10 @@ index f6c9045..ab9657f 100644 ifeq ($(CONFIG_GCC), yes) CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -- -1.7.5 +1.8.3.4 -From dd76984687465e457d9e3dcd0b4bdc4bd46225dd Mon Sep 17 00:00:00 2001 +From 9a194ee7b8498467e5700e2c4e39bc6a30c95714 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 21:09:11 +0200 Subject: configure: enable shared library building for Haiku @@ -97,10 +97,10 @@ index eb8a359..a2ef98d 100755 if [ -z "$CC" ]; then echo "Bypassing toolchain for environment detection." -- -1.7.5 +1.8.3.4 -From 87b2816834bb2bbfc1e13765084a0c21eb46cf13 Mon Sep 17 00:00:00 2001 +From 238a1625cbbb75a1a84c112bacd3e6afee54a919 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 21:09:28 +0200 Subject: libs.mk: no -lm or -lpthread on Haiku @@ -128,5 +128,41 @@ index 79a1d00..d88cfa7 100644 $(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\ -- -1.7.5 +1.8.3.4 + + +From 214d6e14250d72980faf3798501efe5808562854 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= +Date: Tue, 3 Dec 2013 22:18:36 +0000 +Subject: x86_64 support + +* configure, amples.mk + +diff --git a/configure b/configure +index a2ef98d..4b671ee 100755 +--- a/configure ++++ b/configure +@@ -118,6 +118,7 @@ all_platforms="${all_platforms} x86-win32-vs9" + all_platforms="${all_platforms} x86_64-darwin9-gcc" + all_platforms="${all_platforms} x86_64-darwin10-gcc" + all_platforms="${all_platforms} x86_64-darwin11-gcc" ++all_platforms="${all_platforms} x86_64-haiku-gcc" + all_platforms="${all_platforms} x86_64-linux-gcc" + all_platforms="${all_platforms} x86_64-linux-icc" + all_platforms="${all_platforms} x86_64-solaris-gcc" +diff --git a/examples.mk b/examples.mk +index ab9657f..947a645 100644 +--- a/examples.mk ++++ b/examples.mk +@@ -113,7 +113,7 @@ vp8_multi_resolution_encoder.DESCRIPTION = VP8 Multiple-resolution Encoding + # We should not link to math library (libm) on RVCT + # when building for bare-metal targets + ifeq ($(CONFIG_OS_SUPPORT), yes) +- ifneq ($(TOOLCHAIN),x86-haiku-gcc) ++ ifeq (,$(findstring haiku,$(TOOLCHAIN))) + CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m + endif + else +-- +1.8.3.4