public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Martin Gansser <mgansser@online.de>
To: git-commits@fedoraproject.org
Subject: [rpms/mlt] epel9-next: Revert Revert-Prefer-qimage-over-pixbuf.patch
Date: Mon, 20 Jul 2026 18:17:15 GMT	[thread overview]
Message-ID: <178457143592.1.16367375433768677437.rpms-mlt-9b3f4608d5f9@fedoraproject.org> (raw)

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
 

             reply	other threads:[~2026-07-20 18:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-20 18:17 Martin Gansser [this message]
2026-07-20 18:17 [rpms/mlt] epel9-next: Revert Revert-Prefer-qimage-over-pixbuf.patch Martin Gansser

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178457143592.1.16367375433768677437.rpms-mlt-9b3f4608d5f9@fedoraproject.org \
    --to=mgansser@online.de \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox