]> git.pld-linux.org Git - packages/mlt.git/commitdiff
- build with qt5 auto/th/mlt-6.2.0-1
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Sun, 28 Aug 2016 09:05:34 +0000 (11:05 +0200)
committerArkadiusz Miśkiewicz <arekm@maven.pl>
Sun, 28 Aug 2016 09:05:34 +0000 (11:05 +0200)
mlt-qt5.patch [new file with mode: 0644]
mlt.spec

diff --git a/mlt-qt5.patch b/mlt-qt5.patch
new file mode 100644 (file)
index 0000000..54eb354
--- /dev/null
@@ -0,0 +1,21 @@
+diff -urN mlt-6.2.0.org/src/modules/qt/configure mlt-6.2.0/src/modules/qt/configure
+--- mlt-6.2.0.org/src/modules/qt/configure     2016-04-21 04:24:55.000000000 +0200
++++ mlt-6.2.0/src/modules/qt/configure 2016-08-28 11:03:32.132280255 +0200
+@@ -83,7 +83,7 @@
+               echo "- Libexif not found, disabling exif features (auto rotate)"
+       fi
+-      if [ -d "$qt_libdir" -a -d "$qt_includedir" ]
++      if [ 1 -eq 0 -a -d "$qt_libdir" -a -d "$qt_includedir" ]
+       then
+               # test if we have a Qt5 or Qt4
+               if [ -f "$qt_libdir/libQt5Core.so" ] || [ -d "$qt_libdir/QtWidgets.framework" ] || [ -f "$qt_libdir/libQt5Core.a" ]
+@@ -144,7 +144,7 @@
+                       echo QTLIBS=-L$qt_libdir -lQtCore -lQtGui -lQtXml -lQtSvg -lQtOpenGL >> config.mak
+               fi
+       else
+-              pkg-config --exists 'QtGui >= 4'
++              pkg-config --exists 'DISABLE-QtGui >= 4'
+               if [ $? -eq 0 ]
+               then
+                       echo "- Qt version 4.x detected"
index b45d7ca9f0ec766bbcf110eb8f012b376fd6d4ec..8c997045259247ec36892a1697bbb40c99c487d3 100644 (file)
--- a/mlt.spec
+++ b/mlt.spec
@@ -13,10 +13,11 @@ License:    GPL
 Group:         X11/Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/mlt/%{name}-%{version}.tar.gz
 # Source0-md5: cdbc5d1d686b75dd2b8fd14059bdd9d4
+Patch0:                %{name}-qt5.patch
 URL:           http://www.mltframework.org/
-BuildRequires: QtGui-devel
-BuildRequires: QtSvg-devel
-BuildRequires: QtXml-devel
+BuildRequires: Qt5Gui-devel
+BuildRequires: Qt5Svg-devel
+BuildRequires: Qt5Xml-devel
 BuildRequires: SDL-devel
 BuildRequires: SDL_image-devel
 BuildRequires: exiv2-devel
@@ -81,6 +82,7 @@ Ten pakiet zawiera pliki nagłówkowe dla MLT.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Don't overoptimize (breaks debugging)
 sed -i -e '/fomit-frame-pointer/d' configure
This page took 0.121482 seconds and 4 git commands to generate.