peter pushed to libyuv (epel7). "Next svn snapshot - ver. 389 (..more)"

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


>From 2cac8b73e03c85d1c1bffc8ec303caeaa7132866 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 4 Oct 2012 14:23:52 +0400
Subject: Next svn snapshot - ver. 389

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 5d5a483..6abd9f1 100644
--- a/libyuv-0001-Initial-autotools-support.patch
+++ b/libyuv-0001-Initial-autotools-support.patch
@@ -1,33 +1,53 @@
-From b1e815dee9978c992f76a956684c057e12da9078 Mon Sep 17 00:00:00 2001
+From eaa2806843ebbf1b91f11436de196b47b20bd035 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/2] Initial autotools support
+Subject: [PATCH 1/1] Initial autotools support
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
- Makefile.am           |   3 +
- autogen.sh            |   7 +++
- configure.ac          | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++
- source/Makefile.am    |  65 ++++++++++++++++++++++
- source/libyuv.pc.in   |   9 +++
- unit_test/Makefile.am |  27 +++++++++
- 6 files changed, 260 insertions(+)
+ Makefile.am         |  25 +++++++++
+ autogen.sh          |   7 +++
+ configure.ac        | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ source/Makefile.am  |  66 +++++++++++++++++++++++
+ source/libyuv.pc.in |   9 ++++
+ 5 files changed, 255 insertions(+)
  create mode 100644 Makefile.am
  create mode 100755 autogen.sh
  create mode 100644 configure.ac
  create mode 100644 source/Makefile.am
  create mode 100644 source/libyuv.pc.in
- create mode 100644 unit_test/Makefile.am
 
 diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
-index 0000000..8d2aed7
+index 0000000..1127629
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,3 @@
-+SUBDIRS = source unit_test
+@@ -0,0 +1,25 @@
++SUBDIRS = source
 +
-+EXTRA_DIST = AUTHORS DEPS LICENSE PATENTS README.chromium codereview.settings libyuv.gyp libyuv_test.gyp
++EXTRA_DIST = AUTHORS DEPS LICENSE PATENTS README.chromium codereview.settings libyuv.gyp libyuv_test.gyp unit_test/testdata/arm_v7.txt unit_test/testdata/tegra3.txt
++
++if WITH_TEST
++
++TESTS = unittest
++
++noinst_PROGRAMS = $(TESTS)
++
++unittest_SOURCES = unit_test/compare_test.cc \
++		    unit_test/cpu_test.cc \
++		    unit_test/planar_test.cc \
++		    unit_test/rotate_test.cc \
++		    unit_test/rotate_argb_test.cc \
++		    unit_test/scale_argb_test.cc \
++		    unit_test/scale_test.cc \
++		    unit_test/unit_test.cc \
++		    unit_test/unit_test.h \
++		    unit_test/version_test.cc
++
++unittest_CXXFLAGS = $(AM_CXXFLAGS) @GTEST_CXXFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)
++unittest_LDADD = @GTEST_LIBS@ $(top_builddir)/source/libyuv.la
++
++endif
 diff --git a/autogen.sh b/autogen.sh
 new file mode 100755
 index 0000000..bfd37d1
@@ -43,10 +63,10 @@ index 0000000..bfd37d1
 +autoconf
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
-index 0000000..5717422
+index 0000000..7014cee
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,148 @@
 +AC_INIT([libyuv], [0], [http://groups.google.com/group/discuss-libyuv], [libyuv], [http://code.google.com/p/libyuv/])
 +
 +AC_CANONICAL_TARGET
@@ -62,7 +82,7 @@ index 0000000..5717422
 +AC_LANG_CPLUSPLUS
 +
 +AC_ARG_WITH([mjpeg],
-+	    AC_HELP_STRING([--with-mjpeg],[enable Motion JPEG decoder.]),
++	    AC_HELP_STRING([--with-mjpeg],[enable Motion JPEG decoder [default=yes].]),
 +	    [with_mjpeg="$withval"],[with_mjpeg="no"]
 +	    )
 +
@@ -92,7 +112,7 @@ index 0000000..5717422
 +
 +
 +AC_ARG_WITH([test],
-+	    AC_HELP_STRING([--with-test],[enable test suite.]),
++	    AC_HELP_STRING([--with-test],[enable test suite [default=no].]),
 +	    [with_test="$withval"],[with_test="no"]
 +	    )
 +
@@ -166,7 +186,6 @@ index 0000000..5717422
 +Makefile
 +source/libyuv.pc
 +source/Makefile
-+unit_test/Makefile
 +])
 +
 +AM_CONDITIONAL(LIBYUV_POSIX, test "$posix" = "yes")
@@ -198,10 +217,10 @@ index 0000000..5717422
 +])
 diff --git a/source/Makefile.am b/source/Makefile.am
 new file mode 100644
-index 0000000..c88c224
+index 0000000..ef46e90
 --- /dev/null
 +++ b/source/Makefile.am
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,66 @@
 +lib_LTLIBRARIES = libyuv.la
 +
 +pkgconfigdir = $(libdir)/pkgconfig
@@ -238,6 +257,7 @@ index 0000000..c88c224
 +			       ../include/libyuv/planar_functions.h \
 +			       ../include/libyuv/rotate.h \
 +			       ../include/libyuv/rotate_argb.h \
++			       ../include/libyuv/row.h \
 +			       ../include/libyuv/scale.h \
 +			       ../include/libyuv/scale_argb.h \
 +			       ../include/libyuv/version.h \
@@ -282,39 +302,6 @@ index 0000000..d921dd5
 +Description: YUV conversion and scaling functionality library
 +Version: @PACKAGE_VERSION@
 +Libs: -lyuv
-diff --git a/unit_test/Makefile.am b/unit_test/Makefile.am
-new file mode 100644
-index 0000000..c0a56c0
---- /dev/null
-+++ b/unit_test/Makefile.am
-@@ -0,0 +1,27 @@
-+if WITH_TEST
-+
-+TESTS = unit_test
-+
-+noinst_PROGRAMS = $(TESTS)
-+
-+unit_test_SOURCES = compare_test.cc \
-+		    cpu_test.cc \
-+		    planar_test.cc \
-+		    rotate_test.cc \
-+		    rotate_argb_test.cc \
-+		    scale_argb_test.cc \
-+		    scale_test.cc \
-+		    unit_test.cc \
-+		    unit_test.h \
-+		    version_test.cc
-+
-+unit_test_CXXFLAGS = $(AM_CXXFLAGS) @GTEST_CXXFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)
-+unit_test_LDADD = @GTEST_LIBS@ $(top_builddir)/source/libyuv.la
-+
-+else
-+
-+TESTS =
-+
-+endif
-+
-+EXTRA_DIST = testdata/arm_v7.txt testdata/tegra3.txt
 -- 
-1.7.11.4
+1.7.12.1
 
diff --git a/libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch b/libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch
deleted file mode 100644
index 4e23332..0000000
--- a/libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7d7c1b61efcb77d760fc93053ba2d88b23b85168 Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov <lemenkov at gmail.com>
-Date: Sun, 4 Mar 2012 11:07:55 +0400
-Subject: [PATCH 2/2] Fix paths in ArmCpuCaps test
-
-Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
----
- unit_test/cpu_test.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/unit_test/cpu_test.cc b/unit_test/cpu_test.cc
-index 388702f..ecb2d9b 100644
---- a/unit_test/cpu_test.cc
-+++ b/unit_test/cpu_test.cc
-@@ -85,14 +85,14 @@ TEST_F(libyuvTest, TestCpuId) {
- extern "C" int ArmCpuCaps(const char* cpuinfoname);
- 
- TEST_F(libyuvTest, TestLinuxNeon) {
--  int testdata = ArmCpuCaps("unit_test/testdata/arm_v7.txt");
-+  int testdata = ArmCpuCaps("testdata/arm_v7.txt");
-   if (testdata) {
-     EXPECT_EQ(kCpuInitialized,
--              ArmCpuCaps("unit_test/testdata/arm_v7.txt"));
-+              ArmCpuCaps("testdata/arm_v7.txt"));
-     EXPECT_EQ((kCpuInitialized | kCpuHasNEON),
--              ArmCpuCaps("unit_test/testdata/tegra3.txt"));
-+              ArmCpuCaps("testdata/tegra3.txt"));
-   } else {
--    printf("WARNING: unable to load \"unit_test/testdata/arm_v7.txt\"\n");
-+    printf("WARNING: unable to load \"testdata/arm_v7.txt\"\n");
-   }
- #if defined(__linux__) && defined(__ARM_NEON__)
-   EXPECT_NE(0, ArmCpuCaps("/proc/cpuinfo"));
--- 
-1.7.11.4
-
diff --git a/libyuv.spec b/libyuv.spec
index 5e7d61f..bea5b56 100644
--- a/libyuv.spec
+++ b/libyuv.spec
@@ -1,17 +1,20 @@
+%ifarch %{arm}
+%global with_neon --enable-neon
+%endif
+
+
 Name:		libyuv
 Summary:	YUV conversion and scaling functionality library
 Version:	0
-Release:	0.13.20120915svn353%{?dist}
+Release:	0.14.20121001svn389%{?dist}
 License:	BSD
 Group:		Development/Libraries
 Url:		http://code.google.com/p/libyuv/
-## svn -r 353 export http://libyuv.googlecode.com/svn/trunk libyuv-0
+## svn -r 389 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
-# Fedora-specific.
-Patch2:		libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -42,12 +45,11 @@ Additional header files for development with %{name}.
 %prep
 %setup -q
 %patch1 -p1 -b .autotools
-%patch2 -p1 -b .fix_paths
 
 
 %build
 sh autogen.sh
-%configure --disable-static --with-pic --with-test --with-mjpeg
+%configure --disable-static --with-pic --with-test --with-mjpeg %{?with_neon}
 make %{?_smp_mflags}
 
 
@@ -84,6 +86,10 @@ make check
 
 
 %changelog
+* Thu Oct 04 2012 Peter Lemenkov <lemenkov at gmail.com> - 0-0.14.20121001svn389
+- Next svn snapshot - ver. 389
+- Enable NEON on ARM (if detected)
+
 * Sat Sep 15 2012 Peter Lemenkov <lemenkov at gmail.com> - 0-0.13.20120915svn353
 - Next svn snapshot - ver. 353
 - Dropped upstreamed patch no.3
diff --git a/sources b/sources
index 013ec12..1267364 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c8f9c159a4191a8bb040e8d15f9741d  libyuv-0.tar.bz2
+06a4d57a1d0848fcc9f5695accd771a7  libyuv-0.tar.bz2
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list