Control: tag -1 pending

Rebecca N. Palmer <r.pal...@bham.ac.uk> (2013-10-16):
> frie0r's build process can't find opencv, probably because it
> depends on libcv-dev and the .pc files are now (since 2.3.1-9) in
> libopencv-dev.
> 
> The build succeeds as using opencv is optional, but I don't know how
> much functionality this disables (feel free to adjust the severity
> as appropriate).
> 
> It worked on my system because I do have libopencv-dev installed,
> which suggests that adding that as a build-dep would fix the
> problem, but I don't have time right now to test that properly.

That's indeed the case, thanks for the report and the patch.

I've added a little check to make sure both opencv and gavl support is
enabled, to make it possible to catch such regressions automatically.

The plugins package gains a bunch of opencv binaries in Depends
accordingly.

Mraw,
KiBi.
diff -u frei0r-1.1.22git20091109/debian/changelog frei0r-1.1.22git20091109/debian/changelog
--- frei0r-1.1.22git20091109/debian/changelog
+++ frei0r-1.1.22git20091109/debian/changelog
@@ -1,3 +1,16 @@
+frei0r (1.1.22git20091109-1.4) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Since the configure script only allows for auto-detecting opencv and
+    gavl, rather than making them mandatory, implement post-configure
+    checking for both through config.log, in the common-configure-arch
+    target.
+  * Switch libcv-dev build-dep to libopencv-dev to restore opencv support
+    since the .pc file moved. Thanks to Rebecca N. Palmer again!
+    (Closes: #726487)
+
+ -- Cyril Brulebois <k...@debian.org>  Sun, 20 Oct 2013 14:11:54 +0200
+
 frei0r (1.1.22git20091109-1.3) unstable; urgency=high
 
   * Non-maintainer upload.
diff -u frei0r-1.1.22git20091109/debian/control frei0r-1.1.22git20091109/debian/control
--- frei0r-1.1.22git20091109/debian/control
+++ frei0r-1.1.22git20091109/debian/control
@@ -7,7 +7,7 @@
 Vcs-Git: git://git.dyne.org/frei0r.git
 Vcs-Browser: http://git.dyne.org/?r=frei0r
 Homepage: http://www.piksel.org/frei0r
-Build-Depends: cdbs, debhelper (>> 5.0.0), pkg-config, libcv-dev, libgavl-dev (>= 1.1.0),
+Build-Depends: cdbs, debhelper (>> 5.0.0), pkg-config, libopencv-dev, libgavl-dev (>= 1.1.0),
  libtool, autoconf, automake,
  libcvaux-dev, libhighgui-dev
 Standards-Version: 3.8.3
diff -u frei0r-1.1.22git20091109/debian/rules frei0r-1.1.22git20091109/debian/rules
--- frei0r-1.1.22git20091109/debian/rules
+++ frei0r-1.1.22git20091109/debian/rules
@@ -6,6 +6,12 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+common-configure-arch::
+	if [ $(shell egrep -c "^HAVE_(OPENCV|GAVL)_TRUE=''$$" config.log) != 2 ]; then \
+		echo "Either OPENCV or GAVL support is missing according to config.log"; \
+		exit 1; \
+	fi
+
 clean::
 	$(RM) Makefile.in aclocal.m4 configure doc/Makefile.in
 	$(RM) doc/html/Makefile.in include/Makefile.in ltmain.sh

Attachment: signature.asc
Description: Digital signature

_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Reply via email to