From a9c4be74e4904498ce526a95cddf672ef7c2748b449901dbb1a2a7c4c9b97ef6 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 22 Mar 2016 15:40:59 +0000 Subject: [PATCH] Accepting request 377556 from home:olh:branches:multimedia:libs - Fix build in SLE_11 by disabling ssse3 - Fix vpc.pc version with libvpx-pkgconfig-version.patch OBS-URL: https://build.opensuse.org/request/show/377556 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvpx?expand=0&rev=60 --- libvpx-pkgconfig-version.patch | 14 ++++++++++++++ libvpx.changes | 6 ++++++ libvpx.spec | 9 ++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 libvpx-pkgconfig-version.patch diff --git a/libvpx-pkgconfig-version.patch b/libvpx-pkgconfig-version.patch new file mode 100644 index 0000000..9957dc9 --- /dev/null +++ b/libvpx-pkgconfig-version.patch @@ -0,0 +1,14 @@ +--- + CHANGELOG | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libvpx-1.6.0~pre20160318/CHANGELOG +=================================================================== +--- libvpx-1.6.0~pre20160318.orig/CHANGELOG ++++ libvpx-1.6.0~pre20160318/CHANGELOG +@@ -1,4 +1,4 @@ +-Next Release ++2016-03-18 v1.5.1 "Die Unvollendete" + - Incompatible changes: + The VP9 encoder's default keyframe interval changed to 128 from 9999. + diff --git a/libvpx.changes b/libvpx.changes index 6c53921..5eea2c2 100644 --- a/libvpx.changes +++ b/libvpx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 22 14:54:16 UTC 2016 - olaf@aepfle.de + +- Fix build in SLE_11 by disabling ssse3 +- Fix vpc.pc version with libvpx-pkgconfig-version.patch + ------------------------------------------------------------------- Tue Mar 22 07:57:46 UTC 2016 - adrian@suse.de diff --git a/libvpx.spec b/libvpx.spec index 1542487..0725c72 100644 --- a/libvpx.spec +++ b/libvpx.spec @@ -29,6 +29,7 @@ Group: Productivity/Multimedia/Other Url: http://www.webmproject.org/ Source0: http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-%{version}.tar.xz Source1000: baselibs.conf +Patch0: libvpx-pkgconfig-version.patch # PATCH-FIX-UPSTREAM libvpx-define-config_pic.patch dimstar@opensuse.org -- For older compilers, CONFIG_PIC need to be defined. Patch1: libvpx-define-config_pic.patch Patch2: libvpx-configure-add-s390.patch @@ -98,14 +99,18 @@ The WebM file structure is based on the Matroska container. %prep %setup -q +%patch0 -p1 %patch1 -p0 %patch2 -p0 %patch4 -p0 cp %{S:1} test/ %build +%if 0%{?suse_version} < 1310 +sed -i~ /ssse3/d configure +sed -i~ 's@ssse3@@' build/make/rtcd.pl +%endif cd build -export CFLAGS="-std=gnu89 %{optflags}" # It is only an emulation of autotools configure; the macro does not work # libvpx default enable NEON support on ARMv7, unfortunately some ARMv7 @@ -125,6 +130,8 @@ export CFLAGS="-std=gnu89 %{optflags}" --target=armv7-linux-gcc \ --enable-runtime-cpu-detect \ %endif + --extra-cflags="-std=gnu89 -U_FORTIFY_SOURCE %{optflags}" \ + --extra-cxxflags="-U_FORTIFY_SOURCE %{optflags}" \ --enable-pic make %{?_smp_mflags}