diff --git a/baselibs.conf b/baselibs.conf index 486de76..8f5e8d8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libvpx1 +libvpx2 diff --git a/libvpx-1.3.0.tar.xz b/libvpx-1.3.0.tar.xz deleted file mode 100644 index 969a450..0000000 --- a/libvpx-1.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4087c5195c35ff1de6d9449919c35207822c1b5dc78a6684d88d64f93ec7c6a -size 1752356 diff --git a/libvpx-1.4.0.tar.xz b/libvpx-1.4.0.tar.xz new file mode 100644 index 0000000..b261f8e --- /dev/null +++ b/libvpx-1.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2ae9a7caf543ea5871e27474b694525ac99ca21d8f22f17b78c003103e4813e +size 1519736 diff --git a/libvpx-armv7-use-hard-float.patch b/libvpx-armv7-use-hard-float.patch index da417e1..9f06e98 100644 --- a/libvpx-armv7-use-hard-float.patch +++ b/libvpx-armv7-use-hard-float.patch @@ -1,15 +1,13 @@ -diff --git a/build/make/configure.sh b/build/make/configure.sh -index cf78764..3213d97 100755 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -820,8 +820,8 @@ process_common_toolchain() { +--- build/make/configure.sh.orig 2015-04-03 20:49:19.000000000 +0200 ++++ build/make/configure.sh 2015-05-12 10:44:10.156868400 +0200 +@@ -846,8 +852,8 @@ #endif EOF - fi -- check_add_cflags -march=armv7-a -mfloat-abi=${float_abi} -- check_add_asflags -march=armv7-a -mfloat-abi=${float_abi} -+ check_add_cflags -march=armv7-a -mfloat-abi=hard -+ check_add_asflags -march=armv7-a -mfloat-abi=hard + fi +- check_add_cflags -march=armv7-a -mfloat-abi=${float_abi} +- check_add_asflags -march=armv7-a -mfloat-abi=${float_abi} ++ check_add_cflags -march=armv7-a -mfloat-abi=hard ++ check_add_asflags -march=armv7-a -mfloat-abi=hard - if enabled neon - then + if enabled neon || enabled neon_asm; then + check_add_cflags -mfpu=neon #-ftree-vectorize diff --git a/libvpx-configure-add-s390.patch b/libvpx-configure-add-s390.patch index 3ec702e..bbaade2 100644 --- a/libvpx-configure-add-s390.patch +++ b/libvpx-configure-add-s390.patch @@ -1,25 +1,21 @@ -diff --git a/build/make/configure.sh b/build/make/configure.sh -index 8dcb9bb..cf78764 100755 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -627,6 +627,12 @@ process_common_toolchain() { - *powerpc*) - tgt_isa=ppc32 - ;; -+ *s390x*) -+ tgt_isa=s390x -+ ;; -+ *s390*) -+ tgt_isa=s390 -+ ;; - *sparc*) - tgt_isa=sparc - ;; -diff --git a/configure b/configure -index 4ff3fc7..c590057 100755 ---- a/configure -+++ b/configure -@@ -108,6 +108,8 @@ all_platforms="${all_platforms} ppc32-linux-gcc" +--- build/make/configure.sh.orig 2015-04-03 20:49:19.000000000 +0200 ++++ build/make/configure.sh 2015-05-12 10:50:23.351736000 +0200 +@@ -646,6 +646,12 @@ + *powerpc*) + tgt_isa=ppc32 + ;; ++ *s390x*) ++ tgt_isa=s390x ++ ;; ++ *s390*) ++ tgt_isa=s390 ++ ;; + *sparc*) + tgt_isa=sparc + ;; +--- configure.orig 2015-04-03 20:49:19.000000000 +0200 ++++ configure 2015-05-12 10:50:25.179744000 +0200 +@@ -118,6 +118,8 @@ all_platforms="${all_platforms} ppc64-darwin8-gcc" all_platforms="${all_platforms} ppc64-darwin9-gcc" all_platforms="${all_platforms} ppc64-linux-gcc" diff --git a/libvpx-define-config_pic.patch b/libvpx-define-config_pic.patch index 4ba423a..c7b43f6 100644 --- a/libvpx-define-config_pic.patch +++ b/libvpx-define-config_pic.patch @@ -1,6 +1,5 @@ -diff -ur libvpx-0.9.1/vpx_ports/x86_abi_support.asm libvpx-0.9.1.patched//vpx_ports/x86_abi_support.asm ---- libvpx-0.9.1/vpx_ports/x86_abi_support.asm 2010-06-17 15:08:56.000000000 +0200 -+++ libvpx-0.9.1.patched//vpx_ports/x86_abi_support.asm 2010-08-24 23:47:17.721137912 +0200 +--- vpx_ports/x86_abi_support.asm.orig 2015-04-03 20:49:19.000000000 +0200 ++++ vpx_ports/x86_abi_support.asm 2015-05-12 10:54:31.927314300 +0200 @@ -10,6 +10,7 @@ diff --git a/libvpx-disable-cross-for-arm.patch b/libvpx-disable-cross-for-arm.patch index f157b22..b3e0585 100644 --- a/libvpx-disable-cross-for-arm.patch +++ b/libvpx-disable-cross-for-arm.patch @@ -1,13 +1,11 @@ -Index: build/make/configure.sh -=================================================================== ---- build/make/configure.sh.orig -+++ build/make/configure.sh -@@ -781,7 +781,7 @@ process_common_toolchain() { +--- build/make/configure.sh.orig 2015-04-03 20:49:19.000000000 +0200 ++++ build/make/configure.sh 2015-05-12 10:58:33.338545900 +0200 +@@ -831,7 +837,7 @@ - case ${tgt_cc} in + case ${tgt_cc} in gcc) -- CROSS=${CROSS:-arm-none-linux-gnueabi-} -+ CROSS="" - link_with_cc=gcc - setup_gnu_toolchain - arch_int=${tgt_isa##armv} +- CROSS=${CROSS:-arm-none-linux-gnueabi-} ++ CROSS="" + link_with_cc=gcc + setup_gnu_toolchain + arch_int=${tgt_isa##armv} diff --git a/libvpx.changes b/libvpx.changes index a8809ba..686c85e 100644 --- a/libvpx.changes +++ b/libvpx.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Tue May 12 17:40:07 UTC 2015 - joerg.lorenzen@ki.tng.de + +- Update to version 1.4.0 + + This release includes significant improvements to the VP9 codec. + + Upgrading: + This release is ABI incompatible with 1.3.0. It drops the + compatibility layer, requiring VPX_IMG_FMT_* instead of + IMG_FMT_*, and adds several codec controls for VP9. + + Enhancements: + Faster VP9 encoding and decoding. + Multithreaded VP9 decoding (tile and frame-based). + Multithreaded VP9 encoding - on by default. + YUV 4:2:2 and 4:4:4 support in VP9. + 10 and 12bit support in VP9. + 64bit ARM support by replacing ARM assembly with intrinsics. + + Bug Fixes: + Fixes a VP9 bitstream issue in Profile 1. This only affected + non-YUV 4:2:0 files. + + Known Issues: + Frame Parallel decoding fails for segmented and non-420 files. +- Fixed all patches and changed baselibs.conf to libvpx2. + ------------------------------------------------------------------- Mon Feb 23 14:24:04 UTC 2015 - idonmez@suse.com diff --git a/libvpx.spec b/libvpx.spec index 7b10603..8e6e287 100644 --- a/libvpx.spec +++ b/libvpx.spec @@ -16,8 +16,10 @@ # +%define soname 2 + Name: libvpx -Version: 1.3.0 +Version: 1.4.0 Release: 0 Summary: VP8 codec library License: BSD-3-Clause and GPL-2.0+ @@ -59,13 +61,13 @@ WebM files consist of video streams compressed with the VP8 video codec and audio streams compressed with the Vorbis audio codec. The WebM file structure is based on the Matroska container. -%package -n %{name}1 +%package -n %{name}%{soname} Summary: VP8 codec library License: BSD-3-Clause Group: System/Libraries -%description -n %{name}1 +%description -n %{name}%{soname} WebM is an open, royalty-free, media file format designed for the web. WebM defines the file container structure, video and audio formats. @@ -77,7 +79,7 @@ The WebM file structure is based on the Matroska container. Summary: VP8 codec library - Development headers License: BSD-3-Clause and GPL-2.0+ Group: Development/Languages/C and C++ -Requires: %{name}1 = %{version} +Requires: %{name}%{soname} = %{version} %description devel Development headers and library @@ -91,10 +93,10 @@ The WebM file structure is based on the Matroska container. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -%patch4 -p1 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 %build cd build @@ -130,15 +132,15 @@ rm %{buildroot}%{_libdir}/libvpx.a %clean rm -rf %{buildroot} -%post -n %{name}1 -p /sbin/ldconfig +%post -n %{name}%{soname} -p /sbin/ldconfig -%postun -n %{name}1 -p /sbin/ldconfig +%postun -n %{name}%{soname} -p /sbin/ldconfig %files -n vpx-tools %defattr(-,root,root) %{_bindir}/* -%files -n %{name}1 +%files -n %{name}%{soname} %defattr(-, root, root) %doc LICENSE AUTHORS README CHANGELOG %{_libdir}/libvpx.so.*