[rpms/mlt] epel9-next: Revert Revert-Prefer-qimage-over-pixbuf.patch

[rpms/mlt] epel9-next: Revert Revert-Prefer-qimage-over-pixbuf.patch

[Martin Gansser]

A new commit has been pushed.

Repo   : rpms/mlt
Branch : epel9-next
Commit : 9b3f4608d5f9b7e01beed006a1086434400de1b2
Author : Martin Gansser <mgansser@online.de>
Date   : 2018-07-12T16:40:07+02:00
Stats  : +5/-65 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/mlt/c/9b3f4608d5f9b7e01beed006a1086434400de1b2?branch=epel9-next

Log:
Revert Revert-Prefer-qimage-over-pixbuf.patch

---
diff --git a/Revert-Prefer-qimage-over-pixbuf.patch b/Revert-Prefer-qimage-over-pixbuf.patch
deleted file mode 100644
index 8e84156..0000000
--- a/Revert-Prefer-qimage-over-pixbuf.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0049e5d5272feea5c803a174f5bb42d67ab177c1 Mon Sep 17 00:00:00 2001
-From: Bernhard Landauer <oberon@manjaro.org>
-Date: Fri, 15 Jun 2018 16:39:21 +0200
-Subject: [PATCH] Revert "Prefer qimage over pixbuf."
-
-This reverts commit 7bf5da86d4f2f8f83f45b9809fb061cbfdd97906.
----
- src/modules/core/loader.dict | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/modules/core/loader.dict b/src/modules/core/loader.dict
-index ae96f428a..cd68da0ec 100644
---- a/src/modules/core/loader.dict
-+++ b/src/modules/core/loader.dict
-@@ -10,18 +10,18 @@ plain:https://*=webvfx:plain:
- *.inigo=melt_file
- *.asf=avformat
- *.avi=mcdv,avformat,libdv
--*.bmp=qimage,pixbuf
-+*.bmp=pixbuf,qimage
- *.dv=mcdv,avformat,libdv
- *.dif=mcdv,avformat,libdv
- *.exr=qimage
--*.gif=qimage,pixbuf
-+*.gif=pixbuf,qimage
- *.graphics=xml
- *.htm=webvfx:plain:
- *.html=webvfx:plain:
- *.jfx=xml
- *.jef=xml
--*.jpg=qimage,pixbuf
--*.jpeg=qimage,pixbuf
-+*.jpg=pixbuf,qimage
-+*.jpeg=pixbuf,qimage
- *.kdenlivetitle=kdenlivetitle
- *.kino=xml
- *.kra=qimage
-@@ -31,17 +31,17 @@ plain:https://*=webvfx:plain:
- *.mpeg=mcmpeg,avformat
- *.mpl=pango
- *.ogg=avformat,vorbis
--*.pcx=qimage,pixbuf
--*.pgm=pgm,qimage,pixbuf
--*.png=qimage,pixbuf
-+*.pcx=pixbuf,qimage
-+*.pgm=pgm,pixbuf,qimage
-+*.png=pixbuf,qimage
- *.psd=qimage
- *.qml=webvfx:plain:
- *.story=xml
--*.svg=qimage,pixbuf
-+*.svg=pixbuf,qimage
- *.swf=avformat,swfdec
--*.tga=qimage,pixbuf
--*.tif=qimage,pixbuf
--*.tiff=qimage,pixbuf
-+*.tga=pixbuf,qimage
-+*.tif=pixbuf,qimage
-+*.tiff=pixbuf,qimage
- *.txt=qtext,pango
- *.vob=mcmpeg,avformat
- *.wav=avformat

diff --git a/mlt.spec b/mlt.spec
index 002d6d2..7f73f8b 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -11,7 +11,7 @@
 
 Name:           mlt
 Version:        6.10.0
-Release:        1%{?gver}%{?dist}
+Release:        2%{?gver}%{?dist}
 Summary:        Toolkit for broadcasters, video editors, media players, transcoders
 
 # mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -21,7 +21,6 @@ URL:            http://www.mltframework.org/
 Group:          System Environment/Libraries
 Source0:        https://github.com/mltframework/mlt/archive/v%{version}/%{name}-%{version}.tar.gz
 #Patch0:         https://github.com/mltframework/mlt/compare/v6.4.1...%%{commit}.diff
-Patch0:         Revert-Prefer-qimage-over-pixbuf.patch
 
 BuildRequires:  frei0r-devel
 BuildRequires:  opencv-devel
@@ -124,7 +123,7 @@ This module allows to work with MLT using PHP.
 
 
 %prep
-%autosetup -p1 -n %{name}-%{version}
+%setup -n %{name}-%{version}
 
 chmod 644 src/modules/qt/kdenlivetitle_wrapper.cpp
 chmod 644 src/modules/kdenlive/filter_freeze.c
@@ -235,6 +234,9 @@ test "$(pkg-config --modversion mlt++)" = "%{version}"
 
 
 %changelog
+* Thu Jul 12 2018 Martin Gansser <martinkg@fedoraproject.org> - 6.10.0-2
+- Revert Revert-Prefer-qimage-over-pixbuf.patch
+
 * Tue Jul 03 2018 Martin Gansser <martinkg@fedoraproject.org> - 6.10.0-1
 - Update to 6.10.0
 

[rpms/mlt] epel9-next: Revert Revert-Prefer-qimage-over-pixbuf.patch

[Martin Gansser]

            A new commit has been pushed.

            Repo   : rpms/mlt
            Branch : epel9-next
            Commit : f6da6b6f0913b6c9347fd12b9c89a82cfb133702
            Author : Martin Gansser <mgansser@online.de>
            Date   : 2018-07-13T14:18:11+02:00
            Stats  : +13/-6 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/mlt/c/f6da6b6f0913b6c9347fd12b9c89a82cfb133702?branch=epel9-next

            Log:
            Revert Revert-Prefer-qimage-over-pixbuf.patch
Add 'if' conditions to fix missing python2 on Fedora 29

---
diff --git a/mlt.spec b/mlt.spec
index c2aa15d..17beca5 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -9,9 +9,12 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 #global gver .%%{gitdate}git%%{shortcommit}
 
+# bytecompile with Python 2
+%global __python %{__python2}
+
 Name:           mlt
 Version:        6.10.0
-Release:        3%{?gver}%{?dist}
+Release:        2%{?gver}%{?dist}
 Summary:        Toolkit for broadcasters, video editors, media players, transcoders
 
 # mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -123,7 +126,7 @@ This module allows to work with MLT using PHP.
 
 
 %prep
-%setup -n %{name}-%{version}
+%setup -qn %{name}-%{version}
 
 chmod 644 src/modules/qt/kdenlivetitle_wrapper.cpp
 chmod 644 src/modules/kdenlive/filter_freeze.c
@@ -144,6 +147,12 @@ sed -i 's|-php5|-php7|g' src/swig/php/build
 sed -i 's|mlt_wrap.cpp|mlt_wrap.cxx|g' src/swig/php/build
 %endif
 
+%if 0%{?fedora} >= 29
+find src/swig/python -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|'
+sed -i -e 's|which python|which python2|' src/swig/python/build
+sed -i -e 's|python -c|python2 -c|' src/swig/python/build
+sed -i -e 's|python-config|python2-config|' src/swig/python/build
+%endif
 
 %build
 #export STRIP=/bin/true
@@ -234,11 +243,9 @@ test "$(pkg-config --modversion mlt++)" = "%{version}"
 
 
 %changelog
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 12 2018 Martin Gansser <martinkg@fedoraproject.org> - 6.10.0-2
+* Fri Jul 13 2018 Martin Gansser <martinkg@fedoraproject.org> - 6.10.0-2
 - Revert Revert-Prefer-qimage-over-pixbuf.patch
+- Add 'if' conditions to fix missing python2 on Fedora 29
 
 * Tue Jul 03 2018 Martin Gansser <martinkg@fedoraproject.org> - 6.10.0-1
 - Update to 6.10.0