rpms/opencv/devel opencv-2.0.0-apps-automake.patch, NONE, 1.1 opencv-2.0.0-data-automake.patch, NONE, 1.1 opencv.spec, 1.38, 1.39

[Haïkel Guémar]

Author: hguemar

Update of /cvs/extras/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20081

Modified Files:
	opencv.spec 
Added Files:
	opencv-2.0.0-apps-automake.patch 
	opencv-2.0.0-data-automake.patch 
Log Message:
Fix autotools scripts (missing LBP features) - #544167

opencv-2.0.0-apps-automake.patch:
 Makefile.am |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE opencv-2.0.0-apps-automake.patch ---
--- OpenCV-2.0.0/apps/Makefile.am.orig	2009-10-01 01:20:58.000000000 +0100
+++ OpenCV-2.0.0/apps/Makefile.am	2009-12-04 13:36:09.000000000 +0100
@@ -4,11 +4,16 @@ AM_LDFLAGS  = @OPENMP_CXXFLAGS@
 
 EXTRA_DIST = \
   CMakeLists.txt \
-  haartraining/CMakeLists.txt 
+  haartraining/CMakeLists.txt \
+  transcascade/CMakeLists.txt
 
 noinst_LTLIBRARIES = libcvhaartraining.la
 
-bin_PROGRAMS = opencv-haartraining opencv-createsamples opencv-performance
+bin_PROGRAMS = \
+  opencv-haartraining \
+  opencv-createsamples \
+  opencv-performance \
+  opencv-traincascade
 
 ALL_CV_LIBS = \
   $(top_builddir)/src/libhighgui.la       \
@@ -27,7 +32,12 @@ noinst_HEADERS = \
   haartraining/cvclassifier.h    \
   haartraining/cvhaartraining.h  \
   haartraining/_cvhaartraining.h \
-  haartraining/_cvcommon.h
+  haartraining/_cvcommon.h \
+  traincascade/boost.h \
+  traincascade/cascadeclassifier.h \
+  traincascade/features.h \
+  traincascade/imagestorage.h \
+  traincascade/lbpfeatures.h
 
 opencv_haartraining_SOURCES = haartraining/haartraining.cpp
 opencv_haartraining_LDADD = libcvhaartraining.la $(ALL_CV_LIBS)
@@ -38,3 +48,14 @@ opencv_createsamples_LDADD = libcvhaartr
 opencv_performance_SOURCES = haartraining/performance.cpp
 opencv_performance_LDADD = libcvhaartraining.la $(ALL_CV_LIBS)
 
+opencv_traincascade_SOURCES = \
+  traincascade/traincascade.cpp \
+  traincascade/cascadeclassifier.cpp \
+  traincascade/boost.cpp \ 
+  traincascade/features.cpp \
+  traincascade/haarfeatures.cpp \
+  traincascade/lbpfeatures.cpp \
+  traincascade/imagestorage.cpp 
+opencv_traincascade_LDADD = \
+  $(ALL_CV_LIBS) \
+  $(top_builddir)/src/libml.la

opencv-2.0.0-data-automake.patch:
 Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE opencv-2.0.0-data-automake.patch ---
--- OpenCV-2.0.0/data/Makefile.am.orig	2009-10-01 01:20:58.000000000 +0100
+++ OpenCV-2.0.0/data/Makefile.am	2009-12-04 13:05:11.000000000 +0100
@@ -25,4 +25,6 @@
   haarcascades/haarcascade_mcs_mouth.xml \
   haarcascades/haarcascade_mcs_nose.xml \
   haarcascades/haarcascade_mcs_righteye.xml \
-  haarcascades/haarcascade_mcs_upperbody.xml
+  haarcascades/haarcascade_mcs_upperbody.xml \
+  \
+  lbpcascades/lbpcascade_frontalface.xml


Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- opencv.spec	27 Nov 2009 16:58:26 -0000	1.38
+++ opencv.spec	6 Dec 2009 11:11:41 -0000	1.39
@@ -4,7 +4,7 @@
 
 Name:           opencv
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -13,6 +13,8 @@ License:        BSD
 URL:            http://opencv.willowgarage.com/wiki/
 Source0:        http://prdownloads.sourceforge.net/opencvlibrary/%{tar_name}-%{version}.tar.bz2
 Source1:        opencv-samples-Makefile
+Patch0:         opencv-2.0.0-data-automake.patch
+Patch1:	        opencv-2.0.0-apps-automake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -69,6 +71,8 @@ This package contains Python bindings fo
 
 %prep
 %setup -q -n %{tar_name}-%{version}
+%patch0 -p1 -b .automake
+%patch1 -p1 -b .automake
 #Renew the autotools (and remove rpath).
 autoreconf -vif
 
@@ -128,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/opencv
 %{_datadir}/opencv/haarcascades
+%{_datadir}/opencv/lbpcascades
 %{_datadir}/opencv/readme.txt
 
 
@@ -149,11 +154,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 06 2009 Haïkel Guémar <karlthered at gmail.com> - 2.0.0-2
+- Fix autotools scripts (missing LBP features) - #544167 
+
 * Fri Nov 27 2009 Haïkel Guémar <karlthered at gmail.com> - 2.0.0-1
 - Updated to 2.0.0
 - Removed upstream-ed patches
 - Ugly hack (added cvconfig.h)
-- disable %check on ppc64
+- Disable %check on ppc64
 
 * Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> - 1.1.0-0.7.pre1
 - fix build on s390x where we don't have libraw1394 and devel
@@ -162,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 - Fix typo I introduced that prevented build on i386/i586
 
 * Fri Jul 30 2009 Haïkel Guémar <karlthered at gmail.com> - 1.1.0.0.5.pre1
-- Added 1394libs and unicap support
+- Added 1394 libs and unicap support
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-0.4.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild