[SCM] ffmpeg/master: Switch from libmodplug to libopenmpt. (Closes: #849840)
aca-guest at users.alioth.debian.org
aca-guest at users.alioth.debian.org
Sat Jan 21 23:05:12 UTC 2017
The following commit has been merged in the master branch:
commit 0cd5b895c748d12db8285283c46f3904c91d6423
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Sat Jan 21 22:39:15 2017 +0100
Switch from libmodplug to libopenmpt. (Closes: #849840)
diff --git a/debian/control b/debian/control
index b8e53f4..ec05196 100644
--- a/debian/control
+++ b/debian/control
@@ -72,8 +72,6 @@ Build-Depends:
libleptonica-dev,
# autodetected for the tiff decoder
liblzma-dev,
-# --enable-libmodplug
- libmodplug-dev,
# --enable-libmp3lame
libmp3lame-dev,
# --enable-netcdf
@@ -90,6 +88,8 @@ Build-Depends:
libopencv-imgproc-dev <!stage1>,
# --enable-libopenjpeg
libopenjp2-7-dev,
+# --enable-libopenmpt
+ libopenmpt-dev,
# --enable-libopus
libopus-dev,
# --enable-libpulse
diff --git a/debian/rules b/debian/rules
index d32b4df..31af258 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,9 +28,9 @@ FLAVORS = standard extra static
# --enable-libilbc (see #675959 for the RFP bug)
# --enable-libkvazaar
# --enable-libmfx
+# --enable-libmodplug (see #849840: replaced with libopenmpt)
# --enable-libnut
# --enable-libopenh264
-# --enable-libopenmpt
# --enable-libschroedinger (see #845037: removal due to security issues)
# --enable-libutvideo
# --enable-libvidstab (see #709193 for the RFP bug)
@@ -64,9 +64,9 @@ CONFIG := --prefix=/usr \
--enable-libfribidi \
--enable-libgme \
--enable-libgsm \
- --enable-libmodplug \
--enable-libmp3lame \
--enable-libopenjpeg \
+ --enable-libopenmpt \
--enable-libopus \
--enable-libpulse \
--enable-librubberband \
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list