[SCM] libav/squeeze-backports: Revert "Enable opencv support."
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Jun 16 15:52:02 UTC 2012
The following commit has been merged in the squeeze-backports branch:
commit f75539ff868d18d639c22130e85bf360d397b852
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Jun 16 12:01:32 2012 +0200
Revert "Enable opencv support."
Opencv is not available in squeeze, nor squeeze-backports. Can be
enabled at some later point if necessary.
This reverts commit 3d412a4603539cb4471bc530ed02b58da53e3643.
Conflicts:
debian/control
diff --git a/debian/confflags b/debian/confflags
index 6aae311..d349450 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -101,7 +101,6 @@ confflags += --enable-frei0r
confflags += --enable-gnutls
confflags += --enable-libcdio
confflags += --enable-libgsm
-confflags += --enable-libopencv
confflags += --enable-libschroedinger
confflags += --enable-libspeex
confflags += --enable-libtheora
diff --git a/debian/control b/debian/control
index f59ea06..aef0038 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends:
libcdio-cdda-dev,
libcdio-dev,
libcdio-paranoia-dev,
- libcv-dev,
libdc1394-22-dev [linux-any],
libdirac-dev,
libfreetype6-dev,
@@ -35,7 +34,6 @@ Build-Depends:
libmp3lame-dev,
libopencore-amrnb-dev,
libopencore-amrwb-dev,
- libopencv-dev,
libopenjpeg-dev,
libpulse-dev,
libraw1394-dev [linux-any],
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list