peter pushed to libyuv (epel7). "Svn ver. 164 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Mar 26 14:41:57 UTC 2015


>From 26acbc9943ed9d80287dfc93d9a61acc244e57bf Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 2 Feb 2012 13:33:41 +0400
Subject: Svn ver. 164

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/libyuv-0001-Initial-autotools-support.patch b/libyuv-0001-Initial-autotools-support.patch
index f3e2731..92aee5b 100644
--- a/libyuv-0001-Initial-autotools-support.patch
+++ b/libyuv-0001-Initial-autotools-support.patch
@@ -1,17 +1,17 @@
-From cfe42adec008210eecff7429ce1dacdd8f5ca1d7 Mon Sep 17 00:00:00 2001
+From 0f0cc80c7fe913d9c41ba3b263ddf84620210ddf Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Fri, 16 Dec 2011 22:08:41 +0400
-Subject: [PATCH 1/1] Initial autotools support
+Subject: [PATCH 1/3] Initial autotools support
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
  Makefile.am           |    1 +
  autogen.sh            |    9 +++++
  configure.ac          |   91 +++++++++++++++++++++++++++++++++++++++++++++++++
- source/Makefile.am    |   47 +++++++++++++++++++++++++
+ source/Makefile.am    |   48 ++++++++++++++++++++++++++
  source/libyuv.pc.in   |    9 +++++
- unit_test/Makefile.am |   20 +++++++++++
- 6 files changed, 177 insertions(+), 0 deletions(-)
+ unit_test/Makefile.am |   21 +++++++++++
+ 6 files changed, 179 insertions(+), 0 deletions(-)
  create mode 100644 Makefile.am
  create mode 100755 autogen.sh
  create mode 100644 configure.ac
@@ -140,10 +140,10 @@ index 0000000..1b4cd8b
 +AC_OUTPUT
 diff --git a/source/Makefile.am b/source/Makefile.am
 new file mode 100644
-index 0000000..6382066
+index 0000000..aee79f3
 --- /dev/null
 +++ b/source/Makefile.am
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,48 @@
 +lib_LTLIBRARIES = libyuv.la
 +
 +pkgconfigdir = $(libdir)/pkgconfig
@@ -161,6 +161,7 @@ index 0000000..6382066
 +			       ../include/libyuv/planar_functions.h \
 +			       ../include/libyuv/rotate.h \
 +			       ../include/libyuv/scale.h \
++			       ../include/libyuv/version.h \
 +			       ../include/libyuv/video_common.h
 +
 +if LIBYUV_POSIX
@@ -208,10 +209,10 @@ index 0000000..d921dd5
 +Libs: -lyuv
 diff --git a/unit_test/Makefile.am b/unit_test/Makefile.am
 new file mode 100644
-index 0000000..f9e742f
+index 0000000..492e7ef
 --- /dev/null
 +++ b/unit_test/Makefile.am
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,21 @@
 +if WITH_TEST
 +
 +TESTS = unit_test
@@ -219,6 +220,7 @@ index 0000000..f9e742f
 +noinst_PROGRAMS = $(TESTS)
 +
 +unit_test_SOURCES = compare_test.cc \
++		    cpu_test.cc \
 +		    planar_test.cc \
 +		    rotate_test.cc \
 +		    scale_test.cc \
@@ -233,5 +235,5 @@ index 0000000..f9e742f
 +
 +endif
 -- 
-1.7.7.5
+1.7.7.6
 
diff --git a/libyuv-0002-Fix-condition-EXPECT_GE-EXPECT_LE.patch b/libyuv-0002-Fix-condition-EXPECT_GE-EXPECT_LE.patch
new file mode 100644
index 0000000..2359dd9
--- /dev/null
+++ b/libyuv-0002-Fix-condition-EXPECT_GE-EXPECT_LE.patch
@@ -0,0 +1,26 @@
+From 347b28e7629e8cd6dc620179b2af4ba0c3d09612 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 29 Jan 2012 16:40:01 +0400
+Subject: [PATCH 2/3] Fix condition (EXPECT_GE -> EXPECT_LE)
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ unit_test/cpu_test.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/unit_test/cpu_test.cc b/unit_test/cpu_test.cc
+index 10e52b0..31cc4bf 100644
+--- a/unit_test/cpu_test.cc
++++ b/unit_test/cpu_test.cc
+@@ -27,7 +27,7 @@ TEST_F(libyuvTest, TestLinuxNeon) {
+ }
+ 
+ TEST_F(libyuvTest, TestVersion) {
+-  EXPECT_GE(159,LIBYUV_VERSION);
++  EXPECT_LE(159,LIBYUV_VERSION);
+ }
+ 
+ }  // namespace libyuv
+-- 
+1.7.7.6
+
diff --git a/libyuv-0003-Fix-assertion-in-ArmCpuCaps-test.patch b/libyuv-0003-Fix-assertion-in-ArmCpuCaps-test.patch
new file mode 100644
index 0000000..c1ae6b4
--- /dev/null
+++ b/libyuv-0003-Fix-assertion-in-ArmCpuCaps-test.patch
@@ -0,0 +1,26 @@
+From 1f8d8688f3427f033745c3cefaec64188868803b Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 29 Jan 2012 16:52:04 +0400
+Subject: [PATCH 3/3] Fix assertion in ArmCpuCaps test
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ unit_test/cpu_test.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/unit_test/cpu_test.cc b/unit_test/cpu_test.cc
+index 31cc4bf..c68a917 100644
+--- a/unit_test/cpu_test.cc
++++ b/unit_test/cpu_test.cc
+@@ -23,7 +23,7 @@ extern "C" int ArmCpuCaps(const char* cpuinfoname);
+ 
+ TEST_F(libyuvTest, TestLinuxNeon) {
+   EXPECT_EQ(0,ArmCpuCaps("testdata/arm_v7.txt"));
+-  EXPECT_NE(kCpuHasNEON,ArmCpuCaps("testdata/tegra3.txt"));
++  EXPECT_EQ(kCpuHasNEON,ArmCpuCaps("testdata/tegra3.txt"));
+ }
+ 
+ TEST_F(libyuvTest, TestVersion) {
+-- 
+1.7.7.6
+
diff --git a/libyuv.spec b/libyuv.spec
index b42a143..ed66ff3 100644
--- a/libyuv.spec
+++ b/libyuv.spec
@@ -1,14 +1,21 @@
 Name:		libyuv
 Summary:	YUV conversion and scaling functionality library
 Version:	0
-Release:	0.3.20120109svn128%{?dist}
+Release:	0.4.20120202svn164%{?dist}
 License:	BSD
 Group:		Development/Libraries
 Url:		http://code.google.com/p/libyuv/
-## svn -r 128 export http://libyuv.googlecode.com/svn/trunk libyuv-0
+## svn -r 164 export http://libyuv.googlecode.com/svn/trunk libyuv-0
 ## tar -cjvf libyuv-0.tar.bz2 libyuv-0
 Source0:	%{name}-%{version}.tar.bz2
+# Fedora-specific. Upstream isn't interested in this.
 Patch1:		libyuv-0001-Initial-autotools-support.patch
+# Sent upstream.
+# http://code.google.com/p/libyuv/issues/detail?id=10
+Patch2:		libyuv-0002-Fix-condition-EXPECT_GE-EXPECT_LE.patch
+# Sent upstream.
+# http://code.google.com/p/libyuv/issues/detail?id=11
+Patch3:		libyuv-0003-Fix-assertion-in-ArmCpuCaps-test.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -38,6 +45,8 @@ Additional header files for development with %{name}.
 %prep
 %setup -q
 %patch1 -p1 -b .autotools
+%patch2 -p1 -b .fix_cond
+%patch3 -p1 -b .fix_assert
 
 
 %build
@@ -79,6 +88,10 @@ make check
 
 
 %changelog
+* Thu Feb 02 2012 Peter Lemenkov <lemenkov at gmail.com> - 0-0.4.20120202svn164
+- Next svn ver. - 164
+- Added two patches - no.2 and no.3
+
 * Thu Jan 12 2012 Peter Lemenkov <lemenkov at gmail.com> - 0-0.3.20120109svn128
 - Use bzip2 instead of xz (for EL-5)
 
diff --git a/sources b/sources
index 5670e51..54a9f11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-477386e026bb4efcf940ed442ec98058  libyuv-0.tar.bz2
+c5d661da04a74c0ae0342e683d6a3a0c  libyuv-0.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libyuv.git/commit/?h=epel7&id=26acbc9943ed9d80287dfc93d9a61acc244e57bf


More information about the scm-commits mailing list