Hello community, here is the log from the commit of package kdenlive for openSUSE:Factory checked in at 2012-12-07 15:35:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenlive (Old) and /work/SRC/openSUSE:Factory/.kdenlive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdenlive", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kdenlive/kdenlive.changes 2012-08-26 11:32:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdenlive.new/kdenlive.changes 2012-12-07 15:35:19.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 30 10:32:21 UTC 2012 - reddw...@opensuse.org + +- Make it work with versioned melt binaries +- Add kdenlive-0.9.2-no_avformat.patch to support systems without + the avformat plugin + +------------------------------------------------------------------- New: ---- kdenlive-0.9.2-no_avformat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenlive.spec ++++++ --- /var/tmp/diff_new_pack.gGdxDI/_old 2012-12-07 15:35:20.000000000 +0100 +++ /var/tmp/diff_new_pack.gGdxDI/_new 2012-12-07 15:35:20.000000000 +0100 @@ -30,6 +30,8 @@ Source0: http://download.kde.org/stable/kdenlive/%{version}/src/kdenlive-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM kdenlive-0.9.2-mlt_datadir.patch http://www.kdenlive.org/mantis/view.php?id=2701 reddw...@opensuse.org -- Use versioned MLT data dir Patch0: kdenlive-0.9.2-mlt_datadir.patch +# PATCH-FIX-UPSTREAM kdenlive-0.9.2-no_avformat.patch http://www.kdenlive.org/mantis/view.php?id=2811 reddw...@opensuse.org -- Make it work even if the avformat plugin is not available +Patch1: kdenlive-0.9.2-no_avformat.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -49,7 +51,8 @@ BuildRequires: pkgconfig(mlt++) >= %{mlt_version} BuildRequires: pkgconfig(mlt-framework) >= %{mlt_version} BuildRequires: pkgconfig(x11) -Requires: %{_bindir}/melt +%define melt_path %(pkg-config --variable=meltbin mlt-framework) +Requires: %{melt_path} # Waiting for the day all libraries have versioned symbols... Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt++.so) --qf '%{NAME}') >= %{mlt_version} Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt.so) --qf '%{NAME}') >= %{mlt_version} @@ -77,6 +80,7 @@ %prep %setup -q %patch0 +%patch1 %build # V4L support is disabled since it's GPL-2.0 only and incompatible with the GPL-3.0+ parts (bnc#765082) ++++++ kdenlive-0.9.2-mlt_datadir.patch ++++++ --- /var/tmp/diff_new_pack.gGdxDI/_old 2012-12-07 15:35:20.000000000 +0100 +++ /var/tmp/diff_new_pack.gGdxDI/_new 2012-12-07 15:35:20.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt -@@ -11,6 +11,15 @@ endif(APPLE) +@@ -11,6 +11,24 @@ endif(APPLE) macro_optional_find_package(Nepomuk) macro_optional_find_package(QJSON) @@ -14,7 +14,16 @@ + string(REGEX REPLACE "[\r\n]" "" MLT_DATADIR "${MLT_DATADIR}") + add_definitions(-DMLT_DATADIR=\\\"\"${MLT_DATADIR}\"\\\") +endif(NOT MLT_DATADIR_failed) -+ ++ ++execute_process( ++ COMMAND pkg-config --variable=meltbin mlt-framework ++ OUTPUT_VARIABLE MLT_MELTBIN ++ RESULT_VARIABLE MLT_MELTBIN_failed) ++if (NOT MLT_MELTBIN_failed) ++ string(REGEX REPLACE "[\r\n]" "" MLT_MELTBIN "${MLT_MELTBIN}") ++ add_definitions(-DMLT_MELTBIN=\\\"\"${MLT_MELTBIN}\"\\\") ++endif(NOT MLT_MELTBIN_failed) ++ option(WITH_V4L "Build capture support with Video4Linux" ON) option(WITH_JogShuttle "Build Jog/Shuttle support" ON) @@ -22,7 +31,7 @@ =================================================================== --- src/mainwindow.cpp.orig +++ src/mainwindow.cpp -@@ -2183,7 +2183,7 @@ void MainWindow::parseProfiles(const QSt +@@ -2183,10 +2183,10 @@ void MainWindow::parseProfiles(const QSt } if (KdenliveSettings::mltpath().isEmpty()) @@ -30,4 +39,8 @@ + KdenliveSettings::setMltpath(QString(MLT_DATADIR) + QString("/profiles/")); if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::rendererpath().endsWith("inigo")) { - QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt"); +- QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt"); ++ QString meltPath = QString(MLT_MELTBIN); + if (!QFile::exists(meltPath)) + meltPath = KStandardDirs::findExe("melt"); + KdenliveSettings::setRendererpath(meltPath); ++++++ kdenlive-0.9.2-no_avformat.patch ++++++ Index: src/renderwidget.cpp =================================================================== --- src/renderwidget.cpp.orig +++ src/renderwidget.cpp @@ -1280,53 +1280,47 @@ void RenderWidget::refreshView() } // Make sure the selected profile uses an installed avformat codec / format - if (!formatsList.isEmpty()) { - QString format; - if (std.startsWith("f=")) format = std.section("f=", 1, 1); - else if (std.contains(" f=")) format = std.section(" f=", 1, 1); - if (!format.isEmpty()) { - format = format.section(' ', 0, 0).toLower(); - if (!formatsList.contains(format)) { - kDebug() << "***** UNSUPPORTED F: " << format; - //sizeItem->setHidden(true); - //sizeItem-item>setFlags(Qt::ItemIsSelectable); - dupItem->setToolTip(i18n("Unsupported video format: %1", format)); - dupItem->setIcon(brokenIcon); - dupItem->setForeground(disabled); - } + QString format; + if (std.startsWith("f=")) format = std.section("f=", 1, 1); + else if (std.contains(" f=")) format = std.section(" f=", 1, 1); + if (!format.isEmpty()) { + format = format.section(' ', 0, 0).toLower(); + if (formatsList.isEmpty() || !formatsList.contains(format)) { + kDebug() << "***** UNSUPPORTED F: " << format; + //sizeItem->setHidden(true); + //sizeItem-item>setFlags(Qt::ItemIsSelectable); + dupItem->setToolTip(i18n("Unsupported video format: %1", format)); + dupItem->setIcon(brokenIcon); + dupItem->setForeground(disabled); } } - if (!acodecsList.isEmpty()) { - QString format; - if (std.startsWith("acodec=")) format = std.section("acodec=", 1, 1); - else if (std.contains(" acodec=")) format = std.section(" acodec=", 1, 1); - if (!format.isEmpty()) { - format = format.section(' ', 0, 0).toLower(); - if (!acodecsList.contains(format)) { - kDebug() << "***** UNSUPPORTED ACODEC: " << format; - //sizeItem->setHidden(true); - //sizeItem->setFlags(Qt::ItemIsSelectable); - dupItem->setToolTip(i18n("Unsupported audio codec: %1", format)); - dupItem->setIcon(brokenIcon); - dupItem->setForeground(disabled); - dupItem->setBackground(disabledbg); - } + QString acodec; + if (std.startsWith("acodec=")) acodec = std.section("acodec=", 1, 1); + else if (std.contains(" acodec=")) acodec = std.section(" acodec=", 1, 1); + if (!acodec.isEmpty()) { + acodec = acodec.section(' ', 0, 0).toLower(); + if (acodecsList.isEmpty() || !acodecsList.contains(acodec)) { + kDebug() << "***** UNSUPPORTED ACODEC: " << acodec; + //sizeItem->setHidden(true); + //sizeItem->setFlags(Qt::ItemIsSelectable); + dupItem->setToolTip(i18n("Unsupported audio codec: %1", acodec)); + dupItem->setIcon(brokenIcon); + dupItem->setForeground(disabled); + dupItem->setBackground(disabledbg); } } - if (!vcodecsList.isEmpty()) { - QString format; - if (std.startsWith("vcodec=")) format = std.section("vcodec=", 1, 1); - else if (std.contains(" vcodec=")) format = std.section(" vcodec=", 1, 1); - if (!format.isEmpty()) { - format = format.section(' ', 0, 0).toLower(); - if (!vcodecsList.contains(format)) { - kDebug() << "***** UNSUPPORTED VCODEC: " << format; - //sizeItem->setHidden(true); - //sizeItem->setFlags(Qt::ItemIsSelectable); - dupItem->setToolTip(i18n("Unsupported video codec: %1", format)); - dupItem->setIcon(brokenIcon); - dupItem->setForeground(disabled); - } + QString vcodec; + if (std.startsWith("vcodec=")) vcodec = std.section("vcodec=", 1, 1); + else if (std.contains(" vcodec=")) vcodec = std.section(" vcodec=", 1, 1); + if (!vcodec.isEmpty()) { + vcodec = vcodec.section(' ', 0, 0).toLower(); + if (vcodecsList.isEmpty() || !vcodecsList.contains(vcodec)) { + kDebug() << "***** UNSUPPORTED VCODEC: " << vcodec; + //sizeItem->setHidden(true); + //sizeItem->setFlags(Qt::ItemIsSelectable); + dupItem->setToolTip(i18n("Unsupported video codec: %1", vcodec)); + dupItem->setIcon(brokenIcon); + dupItem->setForeground(disabled); } } if (std.contains(" profile=") || std.startsWith("profile=")) { Index: export/profiles.xml =================================================================== --- export/profiles.xml.orig +++ export/profiles.xml @@ -8,6 +8,10 @@ <profile name="NTSC 720 30p" standard="NTSC" args="f=mpegts acodec=mp2 ab=384k ar=48000 ac=2 vcodec=mpeg2video s=1280x720 vb=19700k g=15 trellis=1 mlt_profile=hdv_720_30p pass=%passes" /> </group> +<group name="Raw DV" renderer="libdv" type="av" extension="dv"> + <profile name="libdv" /> +</group> + <group name="Raw DV" renderer="avformat" type="av" extension="dv"> <profile name="DV PAL 4:3" standard="PAL" args="f=dv pix_fmt=yuv420p s=720x576 mlt_profile=dv_pal" /> <profile name="DV PAL 16:9" standard="PAL" args="f=dv pix_fmt=yuv420p s=720x576 mlt_profile=dv_pal_wide" /> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
