[neon/backports-focal/mlt/Neon/stable] debian: new release new soversion

Jonathan Riddell null at kde.org
Wed Jul 14 13:57:49 BST 2021


Git commit 5fea89c47dc377e1e07556bce3e9e76d91cf1057 by Jonathan Riddell.
Committed on 14/07/2021 at 12:57.
Pushed by jriddell into branch 'Neon/stable'.

new release new soversion

M  +7    -6    debian/control
D  +0    -2    debian/docs
A  +2    -0    debian/libmlt++-7-7.install
M  +4    -4    debian/libmlt++-dev.install
D  +0    -2    debian/libmlt++3.install
D  +0    -1    debian/libmlt++3.lintian-overrides
A  +1    -0    debian/libmlt++7-7.lintian-overrides
M  +1    -1    debian/libmlt-data.install
M  +4    -3    debian/libmlt-dev.install
D  +0    -3    debian/libmlt6.install
D  +0    -1    debian/libmlt6.lintian-overrides
A  +3    -0    debian/libmlt7-7.install
A  +1    -0    debian/libmlt7-7.lintian-overrides
M  +2    -0    debian/melt.install
M  +30   -35   debian/rules

https://invent.kde.org/neon/backports-focal/mlt/commit/5fea89c47dc377e1e07556bce3e9e76d91cf1057

diff --git a/debian/control b/debian/control
index 1080b90..a8be025 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper-compat (= 12),
                libgtk2.0-dev,
                libjack-dev,
                libmovit-dev,
+               libopencv-dev,
                libqt5opengl5-dev,
                libqt5svg5-dev,
                librtaudio-dev [linux-any],
@@ -38,7 +39,7 @@ Homepage: https://www.mltframework.org
 Package: libmlt-dev
 Section: libdevel
 Architecture: any
-Depends: libmlt6 (= ${binary:Version}), ${misc:Depends}
+Depends: libmlt7-7 (= ${binary:Version}), ${misc:Depends}
 Description: multimedia framework (development)
  MLT is an open source multimedia framework, designed and developed for
  television broadcasting. It provides a toolkit for broadcasters, video
@@ -50,7 +51,7 @@ Description: multimedia framework (development)
  This package contains the static libraries and headers for developing
  applications that use the MLT multimedia framework.
 
-Package: libmlt6
+Package: libmlt7-7
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: libmlt-data (>= ${source:Version})
@@ -68,7 +69,7 @@ Description: multimedia framework (runtime)
 Package: libmlt-data
 Architecture: all
 Depends: ${misc:Depends}
-Enhances: libmlt6
+Enhances: libmlt7-7
 Description: multimedia framework (data)
  MLT is an open source multimedia framework, designed and developed for
  television broadcasting. It provides a toolkit for broadcasters, video
@@ -82,7 +83,7 @@ Description: multimedia framework (data)
 Package: libmlt++-dev
 Section: libdevel
 Architecture: any
-Depends: libmlt++3 (= ${binary:Version}), ${misc:Depends}
+Depends: libmlt++-7-7 (= ${binary:Version}), ${misc:Depends}
 Description: MLT multimedia framework C++ wrapper (development)
  MLT is an open source multimedia framework, designed and developed for
  television broadcasting. It provides a toolkit for broadcasters, video
@@ -94,7 +95,7 @@ Description: MLT multimedia framework C++ wrapper (development)
  This package contains the static libraries and headers for developing
  applications that use the MLT multimedia framework C++ wrapper.
 
-Package: libmlt++3
+Package: libmlt++-7-7
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: MLT multimedia framework C++ wrapper (runtime)
@@ -117,7 +118,7 @@ Description: command line media player and video editor
  multitrack command line oriented video editor. It could also used as an
  minimalistic media player for audio and video files.
 
-Package: python3-mlt
+Package: python3-mlt7
 Architecture: any
 Section: python
 Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 0c668b0..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-docs/framework.txt
-docs/melt.txt
diff --git a/debian/libmlt++-7-7.install b/debian/libmlt++-7-7.install
new file mode 100644
index 0000000..44b7690
--- /dev/null
+++ b/debian/libmlt++-7-7.install
@@ -0,0 +1,2 @@
+usr/lib/*/libmlt++-7.so.7
+usr/lib/*/libmlt++-7.so.7.*
diff --git a/debian/libmlt++-dev.install b/debian/libmlt++-dev.install
index b74f73b..64d4eaa 100644
--- a/debian/libmlt++-dev.install
+++ b/debian/libmlt++-dev.install
@@ -1,4 +1,4 @@
-src/swig/mlt.i usr/include/mlt++/
-usr/include/mlt++/*.h
-usr/lib/*/libmlt++.so
-usr/lib/*/pkgconfig/mlt++.pc
+src/swig/mlt.i usr/include/mlt++-7/
+usr/include/mlt-7/mlt++/
+usr/lib/*/libmlt++-7.so
+usr/lib/*/pkgconfig/mlt++-7.pc
diff --git a/debian/libmlt++3.install b/debian/libmlt++3.install
deleted file mode 100644
index 9b4866a..0000000
--- a/debian/libmlt++3.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libmlt++.so.3
-usr/lib/*/libmlt++.so.6.*
diff --git a/debian/libmlt++3.lintian-overrides b/debian/libmlt++3.lintian-overrides
deleted file mode 100644
index 4702790..0000000
--- a/debian/libmlt++3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libmlt++3: no-symbols-control-file usr/lib/*/libmlt++.so.*
diff --git a/debian/libmlt++7-7.lintian-overrides b/debian/libmlt++7-7.lintian-overrides
new file mode 100644
index 0000000..c44e253
--- /dev/null
+++ b/debian/libmlt++7-7.lintian-overrides
@@ -0,0 +1 @@
+libmlt++7: no-symbols-control-file usr/lib/*/libmlt++-7.so.*
diff --git a/debian/libmlt-data.install b/debian/libmlt-data.install
index 26c503f..ab4e877 100644
--- a/debian/libmlt-data.install
+++ b/debian/libmlt-data.install
@@ -1 +1 @@
-usr/share/mlt/*
+usr/share/mlt-7/*
diff --git a/debian/libmlt-dev.install b/debian/libmlt-dev.install
index 7d11d99..3ede0ae 100644
--- a/debian/libmlt-dev.install
+++ b/debian/libmlt-dev.install
@@ -1,3 +1,4 @@
-usr/include/mlt/framework/*.h
-usr/lib/*/libmlt.so
-usr/lib/*/pkgconfig/mlt-framework.pc
+usr/include/mlt-7/framework/*.h
+usr/lib/*/libmlt-7.so
+usr/lib/*/pkgconfig/mlt-framework-7.pc
+usr/lib/*/cmake/Mlt7/
diff --git a/debian/libmlt6.install b/debian/libmlt6.install
deleted file mode 100644
index 07c6ea8..0000000
--- a/debian/libmlt6.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libmlt.so.6
-usr/lib/*/libmlt.so.6.*
-usr/lib/*/mlt/*
diff --git a/debian/libmlt6.lintian-overrides b/debian/libmlt6.lintian-overrides
deleted file mode 100644
index 4259993..0000000
--- a/debian/libmlt6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libmlt6: no-symbols-control-file usr/lib/*/libmlt.so.*
diff --git a/debian/libmlt7-7.install b/debian/libmlt7-7.install
new file mode 100644
index 0000000..424ad57
--- /dev/null
+++ b/debian/libmlt7-7.install
@@ -0,0 +1,3 @@
+usr/lib/*/libmlt-7.so.7
+usr/lib/*/libmlt-7.so.7.*
+usr/lib/*/mlt-7/*
diff --git a/debian/libmlt7-7.lintian-overrides b/debian/libmlt7-7.lintian-overrides
new file mode 100644
index 0000000..61f3979
--- /dev/null
+++ b/debian/libmlt7-7.lintian-overrides
@@ -0,0 +1 @@
+libmlt7: no-symbols-control-file usr/lib/*/libmlt.so.*
diff --git a/debian/melt.install b/debian/melt.install
index e335a0b..becb7a0 100644
--- a/debian/melt.install
+++ b/debian/melt.install
@@ -1 +1,3 @@
 usr/bin/melt
+usr/bin/melt*
+usr/share/man/man1/melt-7.1
diff --git a/debian/rules b/debian/rules
index b341d91..6d7503b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,40 +1,35 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-# Enable MMX and SSE on amd64 architecture
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), "amd64"))
-	EXTRA_CONFIGURE_OPTS += --enable-mmx --enable-sse
-else
-	EXTRA_CONFIGURE_OPTS += --disable-mmx --disable-sse --disable-sse2
-endif
-
-DEB_CONFIGURE_EXTRA_FLAGS := \
-	--enable-gpl \
-	--enable-gpl3 \
-	--enable-motion_est \
-	$(EXTRA_CONFIGURE_OPTS) \
-	--avformat-shared=/usr \
-	--swig-languages=python \
-	--qimage-libdir=/usr/lib \
-	--disable-swfdec
-
-PYTHON_DIR := usr/lib/python3/dist-packages
-
 %:
-	dh $@ --with python3
+	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
-
-override_dh_auto_clean:
-	[ ! -f config.mak ] || $(MAKE) distclean
-
-override_dh_install:
-	mkdir -p debian/python3-mlt/$(PYTHON_DIR)
-	install -m 644 src/swig/python/mlt.py debian/python3-mlt/$(PYTHON_DIR)/mlt.py
-	install -m 644 src/swig/python/_mlt.so debian/python3-mlt/$(PYTHON_DIR)/_mlt.so
-	dh_install
-
-override_dh_makeshlibs:
-	dh_makeshlibs -V
+	dh_auto_configure -- \
+	-DMOD_NDI=OFF \
+	-DGPL3=ON \
+	-DGPL=ON \
+	-DMOD_AVFORMAT=ON \
+	-DMOD_DECKLINK=ON \
+	-DMOD_FREI0R=ON \
+	-DMOD_GDK=ON \
+	-DMOD_JACKRACK=ON \
+	-DMOD_KDENLIVE=ON \
+	-DMOD_MOVIT=ON \
+	-DMOD_NORMALIZE=ON \
+	-DMOD_OLDFILM=ON \
+	-DMOD_OPENCV=ON \
+	-DMOD_PLUSGPL=ON \
+	-DMOD_PLUS=ON \
+	-DMOD_QT=ON \
+	-DMOD_RESAMPLE=ON \
+	-DMOD_RTAUDIO=ON \
+	-DMOD_RUBBERBAND=ON \
+	-DMOD_SDL1=ON \
+	-DMOD_SDL2=ON \
+	-DMOD_SOX=ON \
+	-DMOD_VIDSTAB=ON \
+	-DMOD_VORBIS=ON \
+	-DMOD_XINE=ON \
+	-DMOD_XML=ON \
+	-DSWIG_PYTHON=ON \
+	-DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_GNU_CPU)


More information about the Neon-commits mailing list