public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: corsepiu <corsepiu@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/opencv] opencv5: - Stop configure.in from hacking CXXFLAGS.
Date: Fri, 28 Aug 2026 13:29:31 GMT [thread overview]
Message-ID: <178792377110.1.2147958858827368888.rpms-opencv-f3a6a113cf24@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/opencv
Branch : opencv5
Commit : f3a6a113cf241e3c85d443f1ce3eb124c8c596c2
Author : corsepiu <corsepiu@fedoraproject.org>
Date : 2006-09-21T15:52:42+00:00
Stats : +90/-6 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/opencv/c/f3a6a113cf241e3c85d443f1ce3eb124c8c596c2?branch=opencv5
Log:
- Stop configure.in from hacking CXXFLAGS.
- Activate testsuite.
- Let *-devel require pkgconfig.
---
diff --git a/opencv-0.9.9-autotools.diff b/opencv-0.9.9-autotools.diff
index 892e593..341b285 100644
--- a/opencv-0.9.9-autotools.diff
+++ b/opencv-0.9.9-autotools.diff
@@ -1,6 +1,6 @@
diff -uNr opencv-0.9.9.orig/aclocal.m4 opencv-0.9.9/aclocal.m4
--- opencv-0.9.9.orig/aclocal.m4 2006-08-18 16:34:17.000000000 +0200
-+++ opencv-0.9.9/aclocal.m4 2006-09-21 04:24:11.000000000 +0200
++++ opencv-0.9.9/aclocal.m4 2006-09-21 17:26:11.000000000 +0200
@@ -13,7 +13,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -234,7 +234,7 @@ diff -uNr opencv-0.9.9.orig/aclocal.m4 opencv-0.9.9/aclocal.m4
else
diff -uNr opencv-0.9.9.orig/configure opencv-0.9.9/configure
--- opencv-0.9.9.orig/configure 2006-08-18 16:34:17.000000000 +0200
-+++ opencv-0.9.9/configure 2006-09-21 04:24:15.000000000 +0200
++++ opencv-0.9.9/configure 2006-09-21 17:26:11.000000000 +0200
@@ -4333,7 +4333,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -916,9 +916,43 @@ diff -uNr opencv-0.9.9.orig/configure opencv-0.9.9/configure
;;
netbsd*)
+@@ -19036,28 +19162,28 @@
+ i686-*-*)
+ if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+ # default to i686/pentiumpro -- people can override this
+- CXXFLAGS="-g -march=i686 -ffast-math -fomit-frame-pointer $CXXFLAGS"
++: CXXFLAGS="-g -march=i686 -ffast-math -fomit-frame-pointer $CXXFLAGS"
+ fi
+ ;;
+ powerpc-*-*)
+ if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+ # default to G3 processors -- people can override this
+- CXXFLAGS="-g -mcpu=G3 -mtune=G5 -fomit-frame-pointer $CXXFLAGS"
++: CXXFLAGS="-g -mcpu=G3 -mtune=G5 -fomit-frame-pointer $CXXFLAGS"
+ fi
+ ;;
+ *-*-*)
+ if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+- CXXFLAGS="-fomit-frame-pointer $CXXFLAGS"
++: CXXFLAGS="-fomit-frame-pointer $CXXFLAGS"
+ fi
+ ;;
+ esac
+
+ CPPFLAGS="-DNDEBUG $CPPFLAGS"
+- CXXFLAGS="-O3 $CXXFLAGS"
++: CXXFLAGS="-O3 $CXXFLAGS"
+ fi
+
+ if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+- CXXFLAGS="-Wall -fno-rtti -pipe $CXXFLAGS"
++: CXXFLAGS="-Wall -fno-rtti -pipe $CXXFLAGS"
+ fi
+
+ # add libm because it is used by several libraries and OpenCV itself
diff -uNr opencv-0.9.9.orig/cvconfig.h.in opencv-0.9.9/cvconfig.h.in
--- opencv-0.9.9.orig/cvconfig.h.in 2006-08-18 16:34:17.000000000 +0200
-+++ opencv-0.9.9/cvconfig.h.in 2006-09-21 04:24:16.000000000 +0200
++++ opencv-0.9.9/cvconfig.h.in 2006-09-21 17:26:11.000000000 +0200
@@ -134,7 +134,7 @@
/* If using the C implementation of alloca, define if you know the
@@ -930,7 +964,7 @@ diff -uNr opencv-0.9.9.orig/cvconfig.h.in opencv-0.9.9/cvconfig.h.in
STACK_DIRECTION = 0 => direction of growth unknown */
diff -uNr opencv-0.9.9.orig/interfaces/swig/python/Makefile.in opencv-0.9.9/interfaces/swig/python/Makefile.in
--- opencv-0.9.9.orig/interfaces/swig/python/Makefile.in 2006-08-18 16:34:45.000000000 +0200
-+++ opencv-0.9.9/interfaces/swig/python/Makefile.in 2006-09-21 04:24:24.000000000 +0200
++++ opencv-0.9.9/interfaces/swig/python/Makefile.in 2006-09-21 17:26:11.000000000 +0200
@@ -63,10 +63,10 @@
*) f=$$p;; \
esac;
diff --git a/opencv-0.9.9-configure.in.diff b/opencv-0.9.9-configure.in.diff
new file mode 100644
index 0000000..f32dfe2
--- /dev/null
+++ b/opencv-0.9.9-configure.in.diff
@@ -0,0 +1,37 @@
+diff -uNr opencv-0.9.9.orig/configure.in opencv-0.9.9/configure.in
+--- opencv-0.9.9.orig/configure.in 2006-08-18 16:34:16.000000000 +0200
++++ opencv-0.9.9/configure.in 2006-09-21 17:26:11.000000000 +0200
+@@ -201,28 +201,28 @@
+ i686-*-*)
+ if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+ # default to i686/pentiumpro -- people can override this
+- CXXFLAGS="-g -march=i686 -ffast-math -fomit-frame-pointer $CXXFLAGS"
++: CXXFLAGS="-g -march=i686 -ffast-math -fomit-frame-pointer $CXXFLAGS"
+ fi
+ ;;
+ powerpc-*-*)
+ if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+ # default to G3 processors -- people can override this
+- CXXFLAGS="-g -mcpu=G3 -mtune=G5 -fomit-frame-pointer $CXXFLAGS"
++: CXXFLAGS="-g -mcpu=G3 -mtune=G5 -fomit-frame-pointer $CXXFLAGS"
+ fi
+ ;;
+ *-*-*)
+ if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+- CXXFLAGS="-fomit-frame-pointer $CXXFLAGS"
++: CXXFLAGS="-fomit-frame-pointer $CXXFLAGS"
+ fi
+ ;;
+ esac
+
+ CPPFLAGS="-DNDEBUG $CPPFLAGS"
+- CXXFLAGS="-O3 $CXXFLAGS"
++: CXXFLAGS="-O3 $CXXFLAGS"
+ fi
+
+ if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+- CXXFLAGS="-Wall -fno-rtti -pipe $CXXFLAGS"
++: CXXFLAGS="-Wall -fno-rtti -pipe $CXXFLAGS"
+ fi
+
+ # add libm because it is used by several libraries and OpenCV itself
diff --git a/opencv.spec b/opencv.spec
index e8461d7..5765e12 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -5,7 +5,7 @@
Name: opencv
Version: 0.9.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Collection of algorithms for computer vision
Group: Development/Libraries
@@ -14,7 +14,8 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm
Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz
Source1: opencv-samples-Makefile
Patch0: opencv-0.9.9-pythondir.diff
-Patch1: opencv-0.9.9-autotools.diff
+Patch1: opencv-0.9.9-configure.in.diff
+Patch2: opencv-0.9.9-autotools.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel
@@ -34,6 +35,7 @@ and Computer Vision algorithms.
Summary: Development files for using the OpenCV library
Group: Development/Libraries
Requires: opencv = %{version}-%{release}
+Requires: pkgconfig
%description devel
This package contains the OpenCV C/C++ library and header files, as well as
@@ -55,6 +57,7 @@ This package contains Python bindings for the OpenCV library.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%{__sed} -i 's/\r//' interfaces/swig/python/*.py \
samples/python/*.py
%{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \
@@ -81,6 +84,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/GNUmakefile
+%check
+# The test suite fails.
+make check ||:
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -123,6 +131,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Sep 21 2006 Ralf Corsépius <rc040203@freenet.de> - 0.9.9-2
+- Stop configure.in from hacking CXXFLAGS.
+- Activate testsuite.
+- Let *-devel require pkgconfig.
+
* Thu Sep 21 2006 Ralf Corsépius <rc040203@freenet.de> - 0.9.9-1
- Upstream update.
- Don't BR: autotools.
reply other threads:[~2026-08-28 13:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178792377110.1.2147958858827368888.rpms-opencv-f3a6a113cf24@fedoraproject.org \
--to=corsepiu@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox