Accepting request 145095 from multimedia:libs

(forwarded request 145093 from adrianSuSE)

OBS-URL: https://build.opensuse.org/request/show/145095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvpx?expand=0&rev=18
This commit is contained in:
Stephan Kulow 2012-12-14 08:41:47 +00:00 committed by Git OBS Bridge
commit 0aea2e4f2d
5 changed files with 44 additions and 35 deletions

View File

@ -0,0 +1,13 @@
--- build/make/configure.sh.orig 2012-12-10 12:55:30.276337981 +0100
+++ build/make/configure.sh 2012-12-10 13:38:41.656642859 +0100
@@ -738,8 +738,8 @@ process_common_toolchain() {
check_add_cflags -mfpu=neon #-ftree-vectorize
check_add_asflags -mfpu=neon
fi
- check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=softfp
- check_add_asflags -mcpu=cortex-a8 -mfloat-abi=softfp #-march=armv7-a
+ check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=hard
+ check_add_asflags -mcpu=cortex-a8 -mfloat-abi=hard #-march=armv7-a
else
check_add_cflags -march=${tgt_isa}
check_add_asflags -march=${tgt_isa}

View File

@ -1,29 +0,0 @@
Index: libvpx-v0.9.7-p1/build/make/configure.sh
===================================================================
--- libvpx-v0.9.7-p1.orig/build/make/configure.sh
+++ libvpx-v0.9.7-p1/build/make/configure.sh
@@ -656,6 +656,8 @@ process_common_toolchain() {
CROSS=${CROSS:-arm-iwmmxt-linux-gnueabi-}
elif enabled symbian; then
CROSS=${CROSS:-arm-none-symbianelf-}
+ elif [[ "$(uname -m)" == $tgt_isa* ]]; then
+ CROSS=${CROSS:-}
else
CROSS=${CROSS:-arm-none-linux-gnueabi-}
fi
@@ -670,8 +672,13 @@ process_common_toolchain() {
check_add_asflags -mcpu=${tgt_isa}
elif enabled armv7
then
- check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-ftree-vectorize
- check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-march=armv7-a
+ if [[ "$(uname -m)" == $tgt_isa* ]]; then
+ check_add_cflags -mfpu=neon
+ check_add_asflags -mfpu=neon
+ else
+ check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-ftree-vectorize
+ check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-march=armv7-a
+ fi
else
check_add_cflags -march=${tgt_isa}
check_add_asflags -march=${tgt_isa}

View File

@ -0,0 +1,11 @@
--- build/make/configure.sh.orig 2012-12-10 12:55:30.276337981 +0100
+++ build/make/configure.sh 2012-12-10 12:58:16.721521547 +0100
@@ -725,7 +725,7 @@ process_common_toolchain() {
case ${tgt_cc} in
gcc)
- CROSS=${CROSS:-arm-none-linux-gnueabi-}
+ CROSS=""
link_with_cc=gcc
setup_gnu_toolchain
arch_int=${tgt_isa##armv}

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Dec 10 12:48:46 UTC 2012 - guillaume@opensuse.org
- Fix ARM builds
+ Removed old unused patch (libvpx-configure-add-armv7-tgt-isa.patch)
+ Add new patches for ARM:
- libvpx-disable-cross-for-arm.patch: to fix toolchain names for ARM
- libvpx-armv7-use-hard-float.patch: to fix float abi for armv7
-------------------------------------------------------------------
Tue Sep 18 08:50:29 UTC 2012 - dimstar@opensuse.org

View File

@ -20,14 +20,15 @@ Name: libvpx
Version: 1.1.0
Release: 0
Summary: VP8 codec library
License: BSD-3-Clause ; GPL-2.0+
License: BSD-3-Clause and GPL-2.0+
Group: Productivity/Multimedia/Other
Url: http://www.webmproject.org/
Source0: http://webm.googlecode.com/files/%{name}-v%{version}.tar.bz2
# PATCH-FIX-UPSTREAM libvpx-define-config_pic.patch dimstar@opensuse.org -- For older compilers, CONFIG_PIC need to be defined.
Patch0: libvpx-define-config_pic.patch
Patch1: libvpx-configure-add-armv7-tgt-isa.patch
Patch2: libvpx-configure-add-s390.patch
Patch1: libvpx-configure-add-s390.patch
Patch2: libvpx-disable-cross-for-arm.patch
Patch3: libvpx-armv7-use-hard-float.patch
# Needed to be able to create pkgconfig() provides.
BuildRequires: pkg-config
BuildRequires: yasm
@ -43,7 +44,7 @@ The WebM file structure is based on the Matroska container.
%package -n vpx-tools
Summary: VP8 codec library - Utilities
License: BSD-3-Clause ; GPL-2.0+
License: BSD-3-Clause and GPL-2.0+
Group: Productivity/Multimedia/Other
%description -n vpx-tools
@ -72,7 +73,7 @@ The WebM file structure is based on the Matroska container.
%package devel
Summary: VP8 codec library - Development headers
License: BSD-3-Clause ; GPL-2.0+
License: BSD-3-Clause and GPL-2.0+
Group: Development/Languages/C and C++
Requires: %{name}1 = %{version}
@ -89,8 +90,9 @@ The WebM file structure is based on the Matroska container.
%prep
%setup -q -n %name-v%version
%patch0 -p1
#patch1 -p1
%patch1
%patch2
%patch3
%build
cd build
@ -106,6 +108,9 @@ export CFLAGS="%{optflags}"
--libdir=%{_libdir} \
--enable-debug \
--enable-shared \
%ifarch armv5tel armv5el
--target=armv5te-linux-gcc \
%endif
%ifarch armv7l armv7hl
--target=armv7-linux-gcc \
--enable-runtime-cpu-detect \