[libyuv] Next svn version - 209
Peter Lemenkov
peter at fedoraproject.org
Thu Mar 8 08:46:34 UTC 2012
commit 3bf76f10d8484d3632123e49fdc6004828fc6fcb
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Mar 8 12:33:35 2012 +0400
Next svn version - 209
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
libyuv-0001-Initial-autotools-support.patch | 203 ++++++++++++-------
...uv-0002-Fix-condition-EXPECT_GE-EXPECT_LE.patch | 26 ---
libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch | 28 +++
libyuv-0003-Fix-assertion-in-ArmCpuCaps-test.patch | 26 ---
libyuv.spec | 23 ++-
sources | 2 +-
6 files changed, 169 insertions(+), 139 deletions(-)
---
diff --git a/libyuv-0001-Initial-autotools-support.patch b/libyuv-0001-Initial-autotools-support.patch
index 92aee5b..9fe06e7 100644
--- a/libyuv-0001-Initial-autotools-support.patch
+++ b/libyuv-0001-Initial-autotools-support.patch
@@ -1,17 +1,17 @@
-From 0f0cc80c7fe913d9c41ba3b263ddf84620210ddf Mon Sep 17 00:00:00 2001
+From 512d57fd809ee0ada237bcac05b64a51b9104881 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/3] Initial autotools support
+Subject: [PATCH 1/2] Initial autotools support
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
- Makefile.am | 1 +
- autogen.sh | 9 +++++
- configure.ac | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
- source/Makefile.am | 48 ++++++++++++++++++++++++++
- source/libyuv.pc.in | 9 +++++
- unit_test/Makefile.am | 21 +++++++++++
- 6 files changed, 179 insertions(+), 0 deletions(-)
+ Makefile.am | 3 +
+ autogen.sh | 7 +++
+ configure.ac | 130 +++++++++++++++++++++++++++++++++++++++++++++++++
+ source/Makefile.am | 59 ++++++++++++++++++++++
+ source/libyuv.pc.in | 9 +++
+ unit_test/Makefile.am | 24 +++++++++
+ 6 files changed, 232 insertions(+), 0 deletions(-)
create mode 100644 Makefile.am
create mode 100755 autogen.sh
create mode 100644 configure.ac
@@ -21,37 +21,37 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
-index 0000000..5e769be
+index 0000000..8d2aed7
--- /dev/null
+++ b/Makefile.am
-@@ -0,0 +1 @@
+@@ -0,0 +1,3 @@
+SUBDIRS = source unit_test
++
++EXTRA_DIST = AUTHORS DEPS LICENSE PATENTS README.chromium codereview.settings libyuv.gyp libyuv_test.gyp
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
-index 0000000..14988f2
+index 0000000..bfd37d1
--- /dev/null
+++ b/autogen.sh
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,7 @@
+#!/bin/sh
-+[ -f NEWS ] || touch NEWS
-+[ -f README ] || touch README
-+[ -f ChangeLog ] || touch ChangeLog
-+libtoolize
++LIBTOOLIZE=`which libtoolize || which glibtoolize`
++
++$LIBTOOLIZE
+aclocal
+automake --add-missing --copy
+autoconf
-+./configure ${@}
diff --git a/configure.ac b/configure.ac
new file mode 100644
-index 0000000..1b4cd8b
+index 0000000..396fa10
--- /dev/null
+++ b/configure.ac
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,130 @@
+AC_INIT([libyuv], [0], [http://groups.google.com/group/discuss-libyuv], [libyuv], [http://code.google.com/p/libyuv/])
+
+AC_CANONICAL_TARGET
+
-+AM_INIT_AUTOMAKE([dist-bzip2 tar-ustar])
++AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip tar-ustar foreign])
+
+AC_SUBST(LIBYUV_VERSION_INFO, [0:0:0])
+
@@ -61,43 +61,36 @@ index 0000000..1b4cd8b
+
+AC_LANG_CPLUSPLUS
+
-+case "$target" in
-+ *-linux*)
-+ posix="yes"
-+ ;;
-+ *-darwin*)
-+ posix="yes"
-+ ;;
-+ *-windows*)
-+ windows="yes"
-+ ;;
-+ *)
-+ AC_MSG_ERROR([No support for this target ($target) yet])
-+ ;;
-+esac
++AC_ARG_WITH([mjpeg],
++ AC_HELP_STRING([--with-mjpeg],[enable Motion JPEG decoder.]),
++ [with_mjpeg="$withval"],[with_mjpeg="no"]
++ )
++
++if test "$with_mjpeg" = "yes" ; then
++ AC_MSG_WARN([Motion JPEG decoder is enabled])
++ # FIXME
++# AC_CHECK_HEADERS(
++# [jpeglib.h],
++# [],
++# [AC_MSG_ERROR([jpeglib.h header not found])],
++# []
++# )
++ AC_CHECK_LIB(
++ [jpeg],
++ [jpeg_read_header],
++ [
++ CXXFLAGS="$CXXFLAGS -DHAVE_JPEG"
++ LIBJPEG_LIBS="-ljpeg"
++ AC_SUBST([LIBJPEG_LIBS])
++ ],
++ [AC_MSG_ERROR([libjpeg or libjpeg-turbo library not found])],
++ []
++ )
++
++else
++ AC_MSG_WARN([Motion JPEG decoder is disabled])
++fi
+
-+AC_ARG_ENABLE(
-+ neon,
-+ [ --enable-neon enable ARM NEON support],
-+ [
-+ AC_MSG_CHECKING(for NEON in current arch/CFLAGS)
-+ AC_LINK_IFELSE([
-+ AC_LANG_PROGRAM(
-+ [[
-+ #include <arm_neon.h>
-+ int32x4_t testfunc(int16_t *a, int16_t *b)
-+ {
-+ return vmull_s16(vld1_s16(a), vld1_s16(b));
-+ }
-+ ]]
-+ )
-+ ],
-+ [has_neon=yes],
-+ [has_neon=no]
-+ )
-+ AC_MSG_RESULT($has_neon)
-+ ]
-+ )
+
+AC_ARG_WITH([test],
+ AC_HELP_STRING([--with-test],[enable test suite.]),
@@ -124,6 +117,51 @@ index 0000000..1b4cd8b
+ AC_MSG_WARN([Test suite is disabled])
+fi
+
++case "$target_os" in
++ linux*)
++ posix="yes"
++ ;;
++ darwin*)
++ posix="yes"
++ ;;
++ mingw*)
++# windows="yes"
++ posix="yes"
++ LDFLAGS="$LDFLAGS -no-undefined --enable-runtime-pseudo-reloc -avoid-version"
++ ;;
++ *)
++ AC_MSG_ERROR([No support for this target ($target) yet])
++ ;;
++esac
++
++case "$target_cpu" in
++ arm*)
++ AC_ARG_ENABLE(neon,
++ [ --enable-neon enable ARM NEON support],
++ [
++ AC_MSG_CHECKING(for NEON in current arch/CFLAGS)
++ AC_LINK_IFELSE([
++ AC_LANG_PROGRAM(
++ [[
++ #include <arm_neon.h>
++ int32x4_t testfunc(int16_t *a, int16_t *b)
++ {
++ return vmull_s16(vld1_s16(a), vld1_s16(b));
++ }
++ ]]
++ )
++ ],
++ [has_neon=yes],
++ [has_neon=no]
++ )
++ AC_MSG_RESULT($has_neon)
++ ]
++ )
++ ;;
++ *)
++ ;;
++esac
++
+AC_CONFIG_FILES([
+Makefile
+source/libyuv.pc
@@ -134,16 +172,17 @@ index 0000000..1b4cd8b
+AM_CONDITIONAL(LIBYUV_POSIX, test "$posix" = "yes")
+AM_CONDITIONAL(LIBYUV_WINDOWS, test "$windows" = "yes")
+
++AM_CONDITIONAL(WITH_MJPEG, test "$with_mjpeg" = "yes")
+AM_CONDITIONAL(WITH_TEST, test "$with_test" = "yes")
+AM_CONDITIONAL(ENABLE_NEON, test "$has_neon" = "yes")
+
+AC_OUTPUT
diff --git a/source/Makefile.am b/source/Makefile.am
new file mode 100644
-index 0000000..aee79f3
+index 0000000..5d1efa5
--- /dev/null
+++ b/source/Makefile.am
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,59 @@
+lib_LTLIBRARIES = libyuv.la
+
+pkgconfigdir = $(libdir)/pkgconfig
@@ -152,17 +191,10 @@ index 0000000..aee79f3
+libyuvincludedir = $(includedir)
+libyuvnobase_includedir = $(includedir)/libyuv
+
-+libyuvinclude_HEADERS = ../include/libyuv.h
-+libyuvnobase_include_HEADERS = ../include/libyuv/basic_types.h \
-+ ../include/libyuv/compare.h \
-+ ../include/libyuv/convert.h \
-+ ../include/libyuv/cpu_id.h \
-+ ../include/libyuv/format_conversion.h \
-+ ../include/libyuv/planar_functions.h \
-+ ../include/libyuv/rotate.h \
-+ ../include/libyuv/scale.h \
-+ ../include/libyuv/version.h \
-+ ../include/libyuv/video_common.h
++if WITH_MJPEG
++mjpeg_SOURCES = mjpeg_decoder.cc
++mjpeg_HDRS = ../include/libyuv/mjpeg_decoder.h
++endif
+
+if LIBYUV_POSIX
+posix_SOURCES = row_posix.cc
@@ -176,22 +208,40 @@ index 0000000..aee79f3
+neon_SOURCES = rotate_neon.cc row_neon.cc
+endif
+
++libyuvinclude_HEADERS = ../include/libyuv.h
++libyuvnobase_include_HEADERS = ../include/libyuv/basic_types.h \
++ ../include/libyuv/compare.h \
++ ../include/libyuv/convert.h \
++ ../include/libyuv/convert_from.h \
++ ../include/libyuv/cpu_id.h \
++ ../include/libyuv/format_conversion.h \
++ ../include/libyuv/planar_functions.h \
++ ../include/libyuv/rotate.h \
++ ../include/libyuv/scale.h \
++ ../include/libyuv/version.h \
++ ../include/libyuv/video_common.h \
++ $(mjpeg_HDRS)
++
+libyuv_la_SOURCES = compare.cc \
+ convert.cc \
-+ convertfrom.cc \
++ convert_from.cc \
+ cpu_id.cc \
+ format_conversion.cc \
+ planar_functions.cc \
+ rotate.cc \
++ rotate_priv.h \
++ row.h \
+ row_common.cc \
+ scale.cc \
+ video_common.cc \
+ $(posix_SOURCES) \
+ $(windows_SOURCES) \
++ $(mjpeg_SOURCES) \
+ $(neon_SOURCES)
+
+libyuv_la_CXXFLAGS = $(AM_LDFLAGS) -I$(top_srcdir)/include
+libyuv_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBYUV_VERSION_INFO)
++libyuv_la_LIBADD = @LIBJPEG_LIBS@
diff --git a/source/libyuv.pc.in b/source/libyuv.pc.in
new file mode 100644
index 0000000..d921dd5
@@ -209,10 +259,10 @@ index 0000000..d921dd5
+Libs: -lyuv
diff --git a/unit_test/Makefile.am b/unit_test/Makefile.am
new file mode 100644
-index 0000000..492e7ef
+index 0000000..4c5d6f6
--- /dev/null
+++ b/unit_test/Makefile.am
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,24 @@
+if WITH_TEST
+
+TESTS = unit_test
@@ -224,7 +274,8 @@ index 0000000..492e7ef
+ planar_test.cc \
+ rotate_test.cc \
+ scale_test.cc \
-+ unit_test.cc
++ unit_test.cc \
++ unit_test.h
+
+unit_test_CXXFLAGS = $(AM_CXXFLAGS) @GTEST_CXXFLAGS@ -I$(top_srcdir)/include
+unit_test_LDADD = @GTEST_LIBS@ $(top_builddir)/source/libyuv.la
@@ -234,6 +285,8 @@ index 0000000..492e7ef
+TESTS =
+
+endif
++
++EXTRA_DIST = testdata/arm_v7.txt testdata/tegra3.txt
--
-1.7.7.6
+1.7.9.1
diff --git a/libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch b/libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch
new file mode 100644
index 0000000..399f6a3
--- /dev/null
+++ b/libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch
@@ -0,0 +1,28 @@
+From 7b6da0ff11c7bac5689ac7920ac8a3c5c07db8dd 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 | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unit_test/cpu_test.cc b/unit_test/cpu_test.cc
+index 0c43d3f..8422d08 100644
+--- a/unit_test/cpu_test.cc
++++ b/unit_test/cpu_test.cc
+@@ -23,8 +23,8 @@ namespace libyuv {
+ extern "C" int ArmCpuCaps(const char* cpuinfoname);
+
+ TEST_F(libyuvTest, TestLinuxNeon) {
+- EXPECT_EQ(0, ArmCpuCaps("unit_test/testdata/arm_v7.txt"));
+- EXPECT_EQ(kCpuHasNEON, ArmCpuCaps("unit_test/testdata/tegra3.txt"));
++ EXPECT_EQ(0, ArmCpuCaps("testdata/arm_v7.txt"));
++ EXPECT_EQ(kCpuHasNEON, ArmCpuCaps("testdata/tegra3.txt"));
+ }
+
+ TEST_F(libyuvTest, TestVersion) {
+--
+1.7.9.1
+
diff --git a/libyuv.spec b/libyuv.spec
index ed66ff3..64b4cd7 100644
--- a/libyuv.spec
+++ b/libyuv.spec
@@ -1,25 +1,22 @@
Name: libyuv
Summary: YUV conversion and scaling functionality library
Version: 0
-Release: 0.4.20120202svn164%{?dist}
+Release: 0.5.20120308svn209%{?dist}
License: BSD
Group: Development/Libraries
Url: http://code.google.com/p/libyuv/
-## svn -r 164 export http://libyuv.googlecode.com/svn/trunk libyuv-0
+## svn -r 209 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
+# Fedora-specific.
+Patch2: libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: gtest-devel
+BuildRequires: libjpeg-devel
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -45,13 +42,12 @@ Additional header files for development with %{name}.
%prep
%setup -q
%patch1 -p1 -b .autotools
-%patch2 -p1 -b .fix_cond
-%patch3 -p1 -b .fix_assert
+%patch2 -p1 -b .fix_paths
%build
sh autogen.sh
-%configure --disable-static --with-pic --with-test
+%configure --disable-static --with-pic --with-test --with-mjpeg
make %{?_smp_mflags}
@@ -88,6 +84,11 @@ make check
%changelog
+* Thu Mar 08 2012 Peter Lemenkov <lemenkov at gmail.com> - 0-0.5.20120308svn209
+- Next svn ver. - 209
+- Drop upstreamed patches
+- Add libjpeg as a dependency
+
* 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
diff --git a/sources b/sources
index 54a9f11..0e1e38a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5d661da04a74c0ae0342e683d6a3a0c libyuv-0.tar.bz2
+e357c0df9c8077c09ed94c01b524d615 libyuv-0.tar.bz2
More information about the scm-commits
mailing list