From 01a8bb73c0308e7454cfd1baaa9e913144443110 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 9 Oct 2010 16:48:11 +0200 Subject: opencv : moved unused files to obsolete dir Signed-off-by: Frans Meulenbroeks --- .../opencv/opencv/debian/010_proper_sonames.diff | 183 +++++++++++++++++++++ .../opencv/opencv/debian/100_python_files.diff | 19 +++ .../opencv/opencv/debian/110_dereferencement.diff | 164 ++++++++++++++++++ 3 files changed, 366 insertions(+) create mode 100644 recipes/obsolete/opencv/opencv/debian/010_proper_sonames.diff create mode 100644 recipes/obsolete/opencv/opencv/debian/100_python_files.diff create mode 100644 recipes/obsolete/opencv/opencv/debian/110_dereferencement.diff (limited to 'recipes/obsolete') diff --git a/recipes/obsolete/opencv/opencv/debian/010_proper_sonames.diff b/recipes/obsolete/opencv/opencv/debian/010_proper_sonames.diff new file mode 100644 index 0000000000..c624c45997 --- /dev/null +++ b/recipes/obsolete/opencv/opencv/debian/010_proper_sonames.diff @@ -0,0 +1,183 @@ +Index: opencv-0.9.7/opencv.pc.in +=================================================================== +--- opencv-0.9.7.orig/opencv.pc.in 2005-07-25 14:25:20.000000000 +0200 ++++ opencv-0.9.7/opencv.pc.in 2006-05-14 05:24:18.000000000 +0200 +@@ -8,5 +8,5 @@ + Name: OpenCV + Description: Intel(R) Open Source Computer Vision Library + Version: @VERSION@ +-Libs: -L${libdir} -lcxcore -lcv -lhighgui -lcvaux ++Libs: -L${libdir} -lcxcore0.9.7 -lcv0.9.7 -lhighgui0.9.7 -lcvaux0.9.7 + Cflags: -I${includedir} +Index: opencv-0.9.7/apps/haartraining/src/Makefile.am +=================================================================== +--- opencv-0.9.7.orig/apps/haartraining/src/Makefile.am 2005-07-25 14:25:44.000000000 +0200 ++++ opencv-0.9.7/apps/haartraining/src/Makefile.am 2006-05-14 05:24:18.000000000 +0200 +@@ -2,10 +2,10 @@ + + bin_PROGRAMS = opencv-haartraining opencv-createsamples opencv-performance + +-ALL_CV_LIBS = \ +- $(top_builddir)/otherlibs/highgui/libhighgui.la \ +- $(top_builddir)/cv/src/libcv.la \ +- $(top_builddir)/cxcore/src/libcxcore.la \ ++ALL_CV_LIBS = \ ++ $(top_builddir)/otherlibs/highgui/libhighgui0.9.7.la \ ++ $(top_builddir)/cv/src/libcv0.9.7.la \ ++ $(top_builddir)/cxcore/src/libcxcore0.9.7.la \ + libcvhaartraining.a + + libcvhaartraining_a_SOURCES = \ +Index: opencv-0.9.7/cv/src/Makefile.am +=================================================================== +--- opencv-0.9.7.orig/cv/src/Makefile.am 2005-07-25 14:25:44.000000000 +0200 ++++ opencv-0.9.7/cv/src/Makefile.am 2006-05-14 05:24:18.000000000 +0200 +@@ -1,6 +1,6 @@ +-lib_LTLIBRARIES = libcv.la ++lib_LTLIBRARIES = libcv0.9.7.la + +-libcv_la_SOURCES = \ ++libcv0_9_7_la_SOURCES = \ + cvaccum.cpp cvadapthresh.cpp cvapprox.cpp cvcalccontrasthistogram.cpp \ + cvcalcimagehomography.cpp cvcalibinit.cpp cvcalibration.cpp \ + cvcamshift.cpp cvcanny.cpp cvcolor.cpp cvcondens.cpp cvcontours.cpp \ +@@ -19,8 +19,8 @@ + noinst_HEADERS = _cv.h _cvgeom.h _cvimgproc.h _cvipp.h _cvlist.h _cvmatrix.h + EXTRA_DIST = cv.dsp cv.vcproj cv.rc resource.h + +-libcv_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@ +-libcv_la_LIBADD = $(top_builddir)/cxcore/src/libcxcore.la ++libcv0_9_7_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@ ++libcv0_9_7_la_LIBADD = $(top_builddir)/cxcore/src/libcxcore0.9.7.la + + LIBS = -ldl -lpthread -lm + +Index: opencv-0.9.7/cvaux/src/Makefile.am +=================================================================== +--- opencv-0.9.7.orig/cvaux/src/Makefile.am 2005-07-25 14:56:45.000000000 +0200 ++++ opencv-0.9.7/cvaux/src/Makefile.am 2006-05-14 05:24:18.000000000 +0200 +@@ -1,6 +1,6 @@ +-lib_LTLIBRARIES = libcvaux.la ++lib_LTLIBRARIES = libcvaux0.9.7.la + +-libcvaux_la_SOURCES = \ ++libcvaux0_9_7_la_SOURCES = \ + camshift.cpp cv3dtracker.cpp cvaux.cpp cvauxutils.cpp \ + cvbgfg_acmmm2003.cpp cvbgfg_common.cpp cvbgfg_gaussmix.cpp \ + cvcalibfilter.cpp cvclique.cpp cvcorrespond.cpp cvcorrimages.cpp \ +@@ -19,7 +19,7 @@ + include_HEADERS = + noinst_HEADERS = _cvaux.h _cvfacedetection.h _cvvectrack.h _cvvm.h + +-libcvaux_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@ +-libcvaux_la_LIBADD = $(top_builddir)/cv/src/libcv.la ++libcvaux0_9_7_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@ ++libcvaux0_9_7_la_LIBADD = $(top_builddir)/cv/src/libcv0.9.7.la + + INCLUDES = -I. -I$(top_srcdir)/cvaux/include -I$(top_srcdir)/cxcore/include -I$(top_srcdir)/cv/include -I$(top_srcdir)/cv/src -I$(top_srcdir) +Index: opencv-0.9.7/cxcore/src/Makefile.am +=================================================================== +--- opencv-0.9.7.orig/cxcore/src/Makefile.am 2005-07-25 14:25:44.000000000 +0200 ++++ opencv-0.9.7/cxcore/src/Makefile.am 2006-05-14 05:24:18.000000000 +0200 +@@ -1,6 +1,6 @@ +-lib_LTLIBRARIES = libcxcore.la ++lib_LTLIBRARIES = libcxcore0.9.7.la + +-libcxcore_la_SOURCES = cxalloc.cpp cxarithm.cpp cxarray.cpp cxcmp.cpp \ ++libcxcore0_9_7_la_SOURCES = cxalloc.cpp cxarithm.cpp cxarray.cpp cxcmp.cpp \ + cxconvert.cpp cxcopy.cpp cxdatastructs.cpp cxdrawing.cpp \ + cxdxt.cpp cxerror.cpp cxjacobieigens.cpp cxlogic.cpp cxlut.cpp \ + cxmathfuncs.cpp cxmatmul.cpp cxmatrix.cpp cxmean.cpp \ +@@ -13,7 +13,7 @@ + + EXTRA_DIST = cxcore.dsp cxcore.vcproj cxcore.rc resource.h + +-libcxcore_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@ ++libcxcore0_9_7_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@ + + LIBS = -ldl -lpthread -lm + +Index: opencv-0.9.7/interfaces/swig/python/Makefile.am +=================================================================== +--- opencv-0.9.7.orig/interfaces/swig/python/Makefile.am 2005-07-25 14:25:44.000000000 +0200 ++++ opencv-0.9.7/interfaces/swig/python/Makefile.am 2006-05-14 05:24:18.000000000 +0200 +@@ -37,14 +37,14 @@ + ../filtered/constants.h \ + cv.i imagedata.i + _cv_la_CXXFLAGS = $(PYTHON_CSPEC) +-_cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la ++_cv_la_LIBADD = $(top_builddir)/cv/src/libcv0.9.7.la + _cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \ + -L$(SWIG_PYTHON_LIBS) + + _highgui_la_SOURCES = _highgui.cpp ../../../otherlibs/highgui/highgui.h \ + highgui.i + _highgui_la_CXXFLAGS = $(PYTHON_CSPEC) +-_highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la ++_highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui0.9.7.la + _highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \ + -L$(SWIG_PYTHON_LIBS) + +Index: opencv-0.9.7/otherlibs/highgui/Makefile.am +=================================================================== +--- opencv-0.9.7.orig/otherlibs/highgui/Makefile.am 2005-07-25 14:25:44.000000000 +0200 ++++ opencv-0.9.7/otherlibs/highgui/Makefile.am 2006-05-14 05:24:18.000000000 +0200 +@@ -1,6 +1,6 @@ +-lib_LTLIBRARIES = libhighgui.la ++lib_LTLIBRARIES = libhighgui0.9.7.la + +-libhighgui_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \ ++libhighgui0_9_7_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \ + cvcap_v4l.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp \ + grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp grfmt_tiff.cpp \ + image.cpp loadsave.cpp precomp.cpp utils.cpp window_lnx.cpp \ +@@ -14,8 +14,8 @@ + + noinst_HEADERS = _highgui.h bitstrm.h grfmt_base.h grfmt_bmp.h grfmt_jpeg.h grfmt_pxm.h grfmt_png.h grfmt_sunras.h grfmt_tiff.h grfmts.h utils.h + +-libhighgui_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@ ++libhighgui0_9_7_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@ + +-libhighgui_la_LIBADD = $(top_builddir)/cv/src/libcv.la @GTK_LIBS@ @IMAGELIBS@ @FFMPEGLIBS@ @IEEE1394LIBS@ ++libhighgui0_9_7_la_LIBADD = $(top_builddir)/cv/src/libcv0.9.7.la @GTK_LIBS@ @IMAGELIBS@ @FFMPEGLIBS@ @IEEE1394LIBS@ + + INCLUDES = -I. -I$(top_srcdir)/cxcore/include -I$(top_srcdir)/cv/include @GTK_CFLAGS@ +Index: opencv-0.9.7/tests/cv/src/Makefile.am +=================================================================== +--- opencv-0.9.7.orig/tests/cv/src/Makefile.am 2005-07-26 15:56:15.000000000 +0200 ++++ opencv-0.9.7/tests/cv/src/Makefile.am 2006-05-14 05:24:18.000000000 +0200 +@@ -27,12 +27,12 @@ + athresh.cpp ats.cpp canny.cpp cvtest.cpp \ + tsysa.cpp ucontours.cpp ugraphics.cpp uiplutils.cpp ureadfile.cpp + +-cvtest_LDADD = \ +- $(top_builddir)/cv/src/libcv.la \ +- $(top_builddir)/cxcore/src/libcxcore.la \ +- $(top_builddir)/tests/trs/libtrs.a \ +- $(top_builddir)/tests/cxts/libcxts.a \ +- $(top_builddir)/cvaux/src/libcvaux.la \ +- $(top_builddir)/otherlibs/highgui/libhighgui.la ++cvtest_LDADD = \ ++ $(top_builddir)/cv/src/libcv0.9.7.la \ ++ $(top_builddir)/cxcore/src/libcxcore0.9.7.la \ ++ $(top_builddir)/tests/trs/libtrs.a \ ++ $(top_builddir)/tests/cxts/libcxts.a \ ++ $(top_builddir)/cvaux/src/libcvaux0.9.7.la \ ++ $(top_builddir)/otherlibs/highgui/libhighgui0.9.7.la + + EXTRA_DIST = cvtest.dsp cvtest.vcproj +Index: opencv-0.9.7/tests/cxcore/src/Makefile.am +=================================================================== +--- opencv-0.9.7.orig/tests/cxcore/src/Makefile.am 2005-07-25 14:25:44.000000000 +0200 ++++ opencv-0.9.7/tests/cxcore/src/Makefile.am 2006-05-14 05:24:18.000000000 +0200 +@@ -11,8 +11,8 @@ + adxt.cpp \ + amath.cpp \ + cxcoretest_main.cpp +-cxcoretest_LDADD = \ +- $(top_builddir)/cxcore/src/libcxcore.la \ ++cxcoretest_LDADD = \ ++ $(top_builddir)/cxcore/src/libcxcore0.9.7.la \ + $(top_builddir)/tests/cxts/libcxts.a + + EXTRA_DIST = precomp.cpp cxcoretest.dsp cxcoretest.vcproj diff --git a/recipes/obsolete/opencv/opencv/debian/100_python_files.diff b/recipes/obsolete/opencv/opencv/debian/100_python_files.diff new file mode 100644 index 0000000000..b1addbc1c5 --- /dev/null +++ b/recipes/obsolete/opencv/opencv/debian/100_python_files.diff @@ -0,0 +1,19 @@ +Index: opencv-0.9.7/interfaces/swig/python/__init__.py +=================================================================== +--- opencv-0.9.7.orig/interfaces/swig/python/__init__.py 2005-03-21 09:28:17.000000000 +0100 ++++ opencv-0.9.7/interfaces/swig/python/__init__.py 2006-05-14 05:24:24.000000000 +0200 +@@ -1,4 +1,3 @@ +-#! /usr/bin/env python + # opencv/__init__.py + + # 2004-03-16, Mark Asbach +Index: opencv-0.9.7/interfaces/swig/python/adaptors.py +=================================================================== +--- opencv-0.9.7.orig/interfaces/swig/python/adaptors.py 2005-03-21 09:28:18.000000000 +0100 ++++ opencv-0.9.7/interfaces/swig/python/adaptors.py 2006-05-14 05:24:24.000000000 +0200 +@@ -1,5 +1,3 @@ +-#! /usr/bin/env python +- + ######################################################################################### + # + # IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. diff --git a/recipes/obsolete/opencv/opencv/debian/110_dereferencement.diff b/recipes/obsolete/opencv/opencv/debian/110_dereferencement.diff new file mode 100644 index 0000000000..da97077d43 --- /dev/null +++ b/recipes/obsolete/opencv/opencv/debian/110_dereferencement.diff @@ -0,0 +1,164 @@ +Index: opencv-0.9.7/cv/include/cvcompat.h +=================================================================== +--- opencv-0.9.7.orig/cv/include/cvcompat.h 2005-05-27 13:49:53.000000000 +0200 ++++ opencv-0.9.7/cv/include/cvcompat.h 2006-06-12 13:38:01.000000000 +0200 +@@ -164,12 +164,15 @@ + CV_INLINE void cvFillImage( CvArr* mat, double color ) + { + CvPoint left_top = { 0, 0 }, right_bottom = { 0, 0 }; ++ union { CvPoint p; CvSize s; } tmp; + +- cvGetRawData( mat, 0, 0, (CvSize*)&right_bottom ); +- right_bottom.x--; ++ tmp.p = right_bottom; ++ ++ cvGetRawData( mat, 0, 0, &tmp.s ); ++ tmp.p.x--; + right_bottom.y--; + +- cvRectangle( mat, left_top, right_bottom, ++ cvRectangle( mat, left_top, tmp.p, + cvColorToScalar( color, cvGetElemType(mat)), + CV_FILLED, 8, 0 ); + } +@@ -429,8 +432,6 @@ + vect1->y = pt[1].y - pt[0].y; + vect2->x = pt[3].x - pt[0].x; + vect2->y = pt[3].y - pt[0].y; +- +- CV_UNREFERENCED( (left, bottom, right, top) ); + } + + typedef int CvDisType; +@@ -777,29 +778,29 @@ + const float* A, const float* k, + int CV_UNREFERENCED(interpolate) ) + { +- float* data; ++ union { float *f; uchar *u; } data; + CvSize sz; +- cvGetRawData( undistortion_map, (uchar**)&data, 0, &sz ); ++ cvGetRawData( undistortion_map, &data.u, 0, &sz ); + assert( sz.width >= 8 ); + /* just save the intrinsic parameters to the map */ +- data[0] = A[0]; data[1] = A[4]; +- data[2] = A[2]; data[3] = A[5]; +- data[4] = k[0]; data[5] = k[1]; +- data[6] = k[2]; data[7] = k[3]; ++ data.f[0] = A[0]; data.f[1] = A[4]; ++ data.f[2] = A[2]; data.f[3] = A[5]; ++ data.f[4] = k[0]; data.f[5] = k[1]; ++ data.f[6] = k[2]; data.f[7] = k[3]; + } + + CV_INLINE void cvUnDistort( const CvArr* src, CvArr* dst, + const CvArr* undistortion_map, + int CV_UNREFERENCED(interpolate) ) + { +- float* data; ++ union { float *f; uchar *u; } data; + float a[] = {0,0,0,0,0,0,0,0,1}; + CvSize sz; +- cvGetRawData( undistortion_map, (uchar**)&data, 0, &sz ); ++ cvGetRawData( undistortion_map, &data.u, 0, &sz ); + assert( sz.width >= 8 ); +- a[0] = data[0]; a[4] = data[1]; +- a[2] = data[2]; a[5] = data[3]; +- cvUnDistortOnce( src, dst, a, data + 4, 1 ); ++ a[0] = data.f[0]; a[4] = data.f[1]; ++ a[2] = data.f[2]; a[5] = data.f[3]; ++ cvUnDistortOnce( src, dst, a, data.f + 4, 1 ); + } + + +@@ -836,13 +837,15 @@ + int mask CV_DEFAULT(CV_GRAPH_ALL_ITEMS)) + { + CvGraphScanner* temp_scanner; ++ void *tmp; + + if( !scanner ) + cvError( CV_StsNullPtr, "cvStartScanGraph", "Null scanner pointer", "cvcompat.h", 0 ); + + temp_scanner = cvCreateGraphScanner( graph, vtx, mask ); + *scanner = *temp_scanner; +- cvFree( (void**)&temp_scanner ); ++ tmp = (void *)temp_scanner; ++ cvFree( &tmp ); + } + + +Index: opencv-0.9.7/cxcore/include/cxcore.h +=================================================================== +--- opencv-0.9.7.orig/cxcore/include/cxcore.h 2005-07-05 17:59:49.000000000 +0200 ++++ opencv-0.9.7/cxcore/include/cxcore.h 2006-06-12 13:37:05.000000000 +0200 +@@ -153,7 +153,10 @@ + CvMat* mat = (CvMat*)arr; /* the first few fields of CvMat and CvMatND are the same */ + mat->data.ptr = NULL; + if( mat->refcount != NULL && --*mat->refcount == 0 ) +- cvFree( (void**)&mat->refcount ); ++ { ++ void *tmp = (void *)mat->refcount; ++ cvFree( &tmp ); ++ } + mat->refcount = NULL; + } + } +Index: opencv-0.9.7/cxcore/include/cxtypes.h +=================================================================== +--- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-06-12 13:37:05.000000000 +0200 ++++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-06-12 13:37:05.000000000 +0200 +@@ -219,9 +219,10 @@ + int i = _mm_cvtsd_si32(t); + return i - _mm_movemask_pd(_mm_cmplt_sd(t,_mm_cvtsi32_sd(t,i))); + #else ++ union { int i; float f; } tmp; + int temp = cvRound(value); +- float diff = (float)(value - temp); +- return temp - (*(int*)&diff < 0); ++ tmp.f = (float)(value - temp); ++ return temp - (tmp.i < 0); + #endif + } + +@@ -233,9 +234,10 @@ + int i = _mm_cvtsd_si32(t); + return i + _mm_movemask_pd(_mm_cmpgt_sd(t,_mm_cvtsi32_sd(t,i))); + #else ++ union { int i; float f; } tmp; + int temp = cvRound(value); +- float diff = (float)(temp - value); +- return temp + (*(int*)&diff < 0); ++ tmp.f = (float)(temp - value); ++ return temp + (tmp.i < 0); + #endif + } + +@@ -249,8 +251,11 @@ + #elif defined __GNUC__ + return isnan(value); + #else*/ +- unsigned lo = (unsigned)*(uint64*)&value; +- unsigned hi = (unsigned)(*(uint64*)&value >> 32); ++ union { uint64 i; double d; } tmp; ++ unsigned lo, hi; ++ tmp.d = value; ++ lo = (unsigned)tmp.i; ++ hi = (unsigned)(tmp.i >> 32); + return (hi & 0x7fffffff) + (lo != 0) > 0x7ff00000; + #endif + } +@@ -263,8 +268,11 @@ + #elif defined __GNUC__ + return isinf(value); + #else*/ +- unsigned lo = (unsigned)*(uint64*)&value; +- unsigned hi = (unsigned)(*(uint64*)&value >> 32); ++ union { uint64 i; double d; } tmp; ++ unsigned lo, hi; ++ tmp.d = value; ++ lo = (unsigned)tmp.i; ++ hi = (unsigned)(tmp.i >> 32); + return (hi & 0x7fffffff) == 0x7ff00000 && lo == 0; + #endif + } -- cgit 1.2.3-korg