[arch-commits] Commit in transmageddon/repos/community-any (6 files)
Balló György
bgyorgy at archlinux.org
Thu May 13 20:16:37 UTC 2021
Date: Thursday, May 13, 2021 @ 20:16:36
Author: bgyorgy
Revision: 933669
archrelease: copy trunk to community-any
Added:
transmageddon/repos/community-any/0001-Fix-AppStream-metadata-validation.patch
(from rev 933668, transmageddon/trunk/0001-Fix-AppStream-metadata-validation.patch)
transmageddon/repos/community-any/0001-Remove-the-usage-of-deprecated-xml.etree.ElementTree.patch
(from rev 933668, transmageddon/trunk/0001-Remove-the-usage-of-deprecated-xml.etree.ElementTree.patch)
transmageddon/repos/community-any/0001-Specify-required-versions-of-GI-components.patch
(from rev 933668, transmageddon/trunk/0001-Specify-required-versions-of-GI-components.patch)
transmageddon/repos/community-any/PKGBUILD
(from rev 933668, transmageddon/trunk/PKGBUILD)
Deleted:
transmageddon/repos/community-any/0001-Fix-AppStream-metadata-validation.patch
transmageddon/repos/community-any/PKGBUILD
-----------------------------------------------------------------+
0001-Fix-AppStream-metadata-validation.patch | 188 +++++-----
0001-Remove-the-usage-of-deprecated-xml.etree.ElementTree.patch | 81 ++++
0001-Specify-required-versions-of-GI-components.patch | 35 +
PKGBUILD | 90 ++--
4 files changed, 260 insertions(+), 134 deletions(-)
Deleted: 0001-Fix-AppStream-metadata-validation.patch
===================================================================
--- 0001-Fix-AppStream-metadata-validation.patch 2021-05-13 20:16:25 UTC (rev 933668)
+++ 0001-Fix-AppStream-metadata-validation.patch 2021-05-13 20:16:36 UTC (rev 933669)
@@ -1,94 +0,0 @@
-From fd139c5cf48f1a805b479899c2bc64156e733209 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Mon, 25 Jan 2016 15:52:46 +0000
-Subject: [PATCH] Update the AppData to spec version 0.7+
-
----
- appdata/transmageddon.appdata.xml.in | 75 ++++++++++++++++------------
- 1 file changed, 44 insertions(+), 31 deletions(-)
-
-diff --git a/appdata/transmageddon.appdata.xml.in b/appdata/transmageddon.appdata.xml.in
-index bb1fd65..ccf5556 100644
---- a/appdata/transmageddon.appdata.xml.in
-+++ b/appdata/transmageddon.appdata.xml.in
-@@ -1,33 +1,46 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2013 Christian F.K. Schaller <uraeus at linuxrising.org> -->
--<application>
-- <id type="desktop">transmageddon.desktop</id>
-- <metadata_license>CC-BY-3.0</metadata_license>
-- <project_license>LGPL-2.1+</project_license>
-- <_name>Transmageddon Media Transcoder</_name>
-- <_summary>Easy to use audio and video transcoding application</_summary>
-- <description>
-- <_p>
--Transmageddon is an application for converting audio and video files between different formats. It allows you to either manually choose the formats you want to convert between or alternatively you can choose a predefined target and the selections will be made for you. Transmageddon supports a very wide range of formats and can also optionally function as a DVD ripping tool.
-- </_p>
-- <_p>Feature list:</_p>
-- <ul>
-- <_li>Wide range of media codecs</_li>
-- <_li>Allows extracting audio or video streams separately</_li>
-- <_li>Alows ripping of DVD if needed software libraries are available</_li>
-- <_li>Supports named device presets</_li>
-- <_li>Lets you add language metadata if missing</_li>
-- <_li>Can change orientation of video if necessary</_li>
-- <_li>Supports files with multiple audio streams</_li>
-- </ul>
-- <_p>
--You might want to install this application if your need to convert media files between different formats due to for example having hardware that only supports a limited range of formats.
-- </_p>
-- </description>
-- <screenshots>
-- <screenshot type="default">https://git.gnome.org/browse/transmageddon/plain/appdata/transmageddon.png</screenshot>
-- </screenshots>
-- <url type="homepage">http://www.linuxrising.org/</url>
-- <updatecontact>uraeus at linuxrising.org</updatecontact>
-- <project_group>GStreamer</project_group>
--</application>
-+<component type="desktop">
-+ <id>transmageddon.desktop</id>
-+ <metadata_license>CC-BY-3.0</metadata_license>
-+ <project_license>LGPL-2.1+</project_license>
-+ <_name>Transmageddon Media Transcoder</_name>
-+ <_summary>Easy to use audio and video transcoding application</_summary>
-+ <description>
-+ <_p>
-+ Transmageddon is an application for converting audio and video files
-+ between different formats.
-+ It allows you to either manually choose the formats you want to convert
-+ between or alternatively you can choose a predefined target and the
-+ selections will be made for you.
-+ Transmageddon supports a very wide range of formats and can also
-+ optionally function as a DVD ripping tool.
-+ </_p>
-+ <_p>Feature list:</_p>
-+ <ul>
-+ <_li>Wide range of media codecs</_li>
-+ <_li>Allows extracting audio or video streams separately</_li>
-+ <_li>Alows ripping of DVD if needed software libraries are available</_li>
-+ <_li>Supports named device presets</_li>
-+ <_li>Lets you add language metadata if missing</_li>
-+ <_li>Can change orientation of video if necessary</_li>
-+ <_li>Supports files with multiple audio streams</_li>
-+ </ul>
-+ <_p>
-+ You might want to install this application if your need to convert media
-+ files between different formats due to for example having hardware that
-+ only supports a limited range of formats.
-+ </_p>
-+ </description>
-+ <screenshots>
-+ <screenshot type="default">
-+ <image>https://git.gnome.org/browse/transmageddon/plain/appdata/transmageddon.png</image>
-+ </screenshot>
-+ </screenshots>
-+ <url type="homepage">http://www.linuxrising.org/</url>
-+ <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=transmageddon</url>
-+ <url type="donation">http://www.gnome.org/friends/</url>
-+ <update_contact>uraeus at linuxrising.org</update_contact>
-+ <project_group>GNOME</project_group>
-+ <translation type="gettext">transmageddon</translation>
-+</component>
---
-2.18.1
-
Copied: transmageddon/repos/community-any/0001-Fix-AppStream-metadata-validation.patch (from rev 933668, transmageddon/trunk/0001-Fix-AppStream-metadata-validation.patch)
===================================================================
--- 0001-Fix-AppStream-metadata-validation.patch (rev 0)
+++ 0001-Fix-AppStream-metadata-validation.patch 2021-05-13 20:16:36 UTC (rev 933669)
@@ -0,0 +1,94 @@
+From fd139c5cf48f1a805b479899c2bc64156e733209 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 25 Jan 2016 15:52:46 +0000
+Subject: [PATCH] Update the AppData to spec version 0.7+
+
+---
+ appdata/transmageddon.appdata.xml.in | 75 ++++++++++++++++------------
+ 1 file changed, 44 insertions(+), 31 deletions(-)
+
+diff --git a/appdata/transmageddon.appdata.xml.in b/appdata/transmageddon.appdata.xml.in
+index bb1fd65..ccf5556 100644
+--- a/appdata/transmageddon.appdata.xml.in
++++ b/appdata/transmageddon.appdata.xml.in
+@@ -1,33 +1,46 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2013 Christian F.K. Schaller <uraeus at linuxrising.org> -->
+-<application>
+- <id type="desktop">transmageddon.desktop</id>
+- <metadata_license>CC-BY-3.0</metadata_license>
+- <project_license>LGPL-2.1+</project_license>
+- <_name>Transmageddon Media Transcoder</_name>
+- <_summary>Easy to use audio and video transcoding application</_summary>
+- <description>
+- <_p>
+-Transmageddon is an application for converting audio and video files between different formats. It allows you to either manually choose the formats you want to convert between or alternatively you can choose a predefined target and the selections will be made for you. Transmageddon supports a very wide range of formats and can also optionally function as a DVD ripping tool.
+- </_p>
+- <_p>Feature list:</_p>
+- <ul>
+- <_li>Wide range of media codecs</_li>
+- <_li>Allows extracting audio or video streams separately</_li>
+- <_li>Alows ripping of DVD if needed software libraries are available</_li>
+- <_li>Supports named device presets</_li>
+- <_li>Lets you add language metadata if missing</_li>
+- <_li>Can change orientation of video if necessary</_li>
+- <_li>Supports files with multiple audio streams</_li>
+- </ul>
+- <_p>
+-You might want to install this application if your need to convert media files between different formats due to for example having hardware that only supports a limited range of formats.
+- </_p>
+- </description>
+- <screenshots>
+- <screenshot type="default">https://git.gnome.org/browse/transmageddon/plain/appdata/transmageddon.png</screenshot>
+- </screenshots>
+- <url type="homepage">http://www.linuxrising.org/</url>
+- <updatecontact>uraeus at linuxrising.org</updatecontact>
+- <project_group>GStreamer</project_group>
+-</application>
++<component type="desktop">
++ <id>transmageddon.desktop</id>
++ <metadata_license>CC-BY-3.0</metadata_license>
++ <project_license>LGPL-2.1+</project_license>
++ <_name>Transmageddon Media Transcoder</_name>
++ <_summary>Easy to use audio and video transcoding application</_summary>
++ <description>
++ <_p>
++ Transmageddon is an application for converting audio and video files
++ between different formats.
++ It allows you to either manually choose the formats you want to convert
++ between or alternatively you can choose a predefined target and the
++ selections will be made for you.
++ Transmageddon supports a very wide range of formats and can also
++ optionally function as a DVD ripping tool.
++ </_p>
++ <_p>Feature list:</_p>
++ <ul>
++ <_li>Wide range of media codecs</_li>
++ <_li>Allows extracting audio or video streams separately</_li>
++ <_li>Alows ripping of DVD if needed software libraries are available</_li>
++ <_li>Supports named device presets</_li>
++ <_li>Lets you add language metadata if missing</_li>
++ <_li>Can change orientation of video if necessary</_li>
++ <_li>Supports files with multiple audio streams</_li>
++ </ul>
++ <_p>
++ You might want to install this application if your need to convert media
++ files between different formats due to for example having hardware that
++ only supports a limited range of formats.
++ </_p>
++ </description>
++ <screenshots>
++ <screenshot type="default">
++ <image>https://git.gnome.org/browse/transmageddon/plain/appdata/transmageddon.png</image>
++ </screenshot>
++ </screenshots>
++ <url type="homepage">http://www.linuxrising.org/</url>
++ <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=transmageddon</url>
++ <url type="donation">http://www.gnome.org/friends/</url>
++ <update_contact>uraeus at linuxrising.org</update_contact>
++ <project_group>GNOME</project_group>
++ <translation type="gettext">transmageddon</translation>
++</component>
+--
+2.18.1
+
Copied: transmageddon/repos/community-any/0001-Remove-the-usage-of-deprecated-xml.etree.ElementTree.patch (from rev 933668, transmageddon/trunk/0001-Remove-the-usage-of-deprecated-xml.etree.ElementTree.patch)
===================================================================
--- 0001-Remove-the-usage-of-deprecated-xml.etree.ElementTree.patch (rev 0)
+++ 0001-Remove-the-usage-of-deprecated-xml.etree.ElementTree.patch 2021-05-13 20:16:36 UTC (rev 933669)
@@ -0,0 +1,81 @@
+From 3f7dd82b90b29bb1ad701d82377a462d6fd80d16 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Thu, 13 May 2021 21:53:45 +0200
+Subject: [PATCH] Remove the usage of deprecated
+ 'xml.etree.ElementTree.Element.getchildren'
+
+This fix is needed for Python 3.9.
+---
+ src/presets.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/presets.py b/src/presets.py
+index 2cc8cf5..40a6f48 100644
+--- a/src/presets.py
++++ b/src/presets.py
+@@ -271,7 +271,7 @@ def _load_author(root):
+ """
+ author = Author()
+
+- for child in root.getchildren():
++ for child in list(root):
+ if child.tag == "name":
+ author.name = child.text.strip()
+ elif child.tag == "email":
+@@ -290,7 +290,7 @@ def _load_audio_codec(root):
+ """
+ codec = AudioCodec()
+
+- for child in root.getchildren():
++ for child in list(root):
+ if child.tag == "name":
+ codec.name = child.text.strip()
+ elif child.tag == "container":
+@@ -304,7 +304,7 @@ def _load_audio_codec(root):
+ elif child.tag == "samplerate":
+ codec.samplerate = child.text.strip()
+ elif child.tag == "presets":
+- for command in child.getchildren():
++ for command in list(child):
+ codec.presets.append(command.text.strip())
+
+ return codec
+@@ -320,7 +320,7 @@ def _load_video_codec(root):
+ """
+ codec = VideoCodec()
+
+- for child in root.getchildren():
++ for child in list(root):
+ if child.tag == "name":
+ codec.name = child.text.strip()
+ elif child.tag == "container":
+@@ -340,7 +340,7 @@ def _load_video_codec(root):
+ elif child.tag == "passes":
+ codec.passes = child.text.strip()
+ elif child.tag == "presets":
+- for command in child.getchildren():
++ for command in list(child):
+ codec.presets.append(command.text.strip())
+
+ return codec
+@@ -356,7 +356,7 @@ def _load_preset(root):
+ """
+ preset = Preset()
+
+- for child in root.getchildren():
++ for child in list(root):
+ if child.tag == "name":
+ preset.name = child.text.strip()
+ elif child.tag == "container":
+@@ -391,7 +391,7 @@ def load(filename):
+
+ device.filename = filename
+
+- for child in tree.getroot().getchildren():
++ for child in list(tree.getroot()):
+ if child.tag == "make":
+ device.make = child.text.strip()
+ elif child.tag == "model":
+--
+2.31.1
+
Copied: transmageddon/repos/community-any/0001-Specify-required-versions-of-GI-components.patch (from rev 933668, transmageddon/trunk/0001-Specify-required-versions-of-GI-components.patch)
===================================================================
--- 0001-Specify-required-versions-of-GI-components.patch (rev 0)
+++ 0001-Specify-required-versions-of-GI-components.patch 2021-05-13 20:16:36 UTC (rev 933669)
@@ -0,0 +1,35 @@
+From 0b36c28fe8e3086d0c0d7e991a09f713e8c1aa5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Thu, 13 May 2021 22:05:00 +0200
+Subject: [PATCH] Specify required versions of GI components
+
+This fixes transmageddon to run when GTK4 is installed on the system.
+---
+ src/transmageddon.py | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/transmageddon.py b/src/transmageddon.py
+index 0721249..89aa36c 100644
+--- a/src/transmageddon.py
++++ b/src/transmageddon.py
+@@ -31,8 +31,16 @@ if sys.version_info[0] < 3:
+
+ import which
+ import time
++import gi
++gi.require_version('Notify', '0.7')
++gi.require_version('Gdk', '3.0')
++gi.require_version('Gtk', '3.0')
++gi.require_version('Gst', '1.0')
++gi.require_version('GstPbutils', '1.0')
++gi.require_version('GstTag', '1.0')
++gi.require_version('GUdev', '1.0')
+ from gi.repository import Notify
+-from gi.repository import GdkX11, Gdk, Gio, Gtk, GLib, Gst, GstPbutils, GstTag
++from gi.repository import Gdk, GdkX11, Gio, Gtk, GLib, Gst, GstPbutils, GstTag
+ from gi.repository import GUdev
+ from gi.repository import GObject, GdkPixbuf
+ # GObject.threads_init()
+--
+2.31.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-13 20:16:25 UTC (rev 933668)
+++ PKGBUILD 2021-05-13 20:16:36 UTC (rev 933669)
@@ -1,40 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Dan Serban
-# Contributor: Federico Chiacchiaretta
-
-pkgname=transmageddon
-pkgver=1.5
-pkgrel=7
-pkgdesc="Simple python application for transcoding video into formats supported by GStreamer"
-arch=('any')
-url="http://www.linuxrising.org/"
-license=('LGPL')
-depends=('python-gobject' 'libnotify' 'gtk3' 'gst-plugins-base')
-makedepends=('intltool')
-optdepends=('gst-plugins-good: Extra media codecs'
- 'gst-plugins-bad: Extra media codecs'
- 'gst-plugins-ugly: Extra media codecs'
- 'gst-libav: Extra media codecs')
-source=(http://www.linuxrising.org/files/$pkgname-$pkgver.tar.xz
- 0001-Fix-AppStream-metadata-validation.patch)
-sha256sums=('ca24369a94ce4edc992c1c7b3e2d09d7cd82794ce4c1b862a1a83ea40121e296'
- 'ca16192de33f8694a74220c3790a230d32c5576c663a34db050e0c2db9b0e002')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Fix AppStream metadata validation
- patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
- sed -i 's|${datadir}/appdata|${datadir}/metainfo|' configure
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: transmageddon/repos/community-any/PKGBUILD (from rev 933668, transmageddon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-13 20:16:36 UTC (rev 933669)
@@ -0,0 +1,50 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Dan Serban
+# Contributor: Federico Chiacchiaretta
+
+pkgname=transmageddon
+pkgver=1.5
+pkgrel=8
+pkgdesc='Simple python application for transcoding video into formats supported by GStreamer'
+arch=('any')
+url='http://www.linuxrising.org/'
+license=('LGPL')
+depends=('gst-plugins-base' 'gst-python' 'gtk3' 'libnotify' 'python-gobject')
+makedepends=('intltool')
+optdepends=('gst-plugins-good: Extra media codecs'
+ 'gst-plugins-bad: Extra media codecs'
+ 'gst-plugins-ugly: Extra media codecs'
+ 'gst-libav: Extra media codecs')
+source=("http://www.linuxrising.org/files/$pkgname-$pkgver.tar.xz"
+ '0001-Specify-required-versions-of-GI-components.patch'
+ '0001-Remove-the-usage-of-deprecated-xml.etree.ElementTree.patch'
+ '0001-Fix-AppStream-metadata-validation.patch')
+sha256sums=('ca24369a94ce4edc992c1c7b3e2d09d7cd82794ce4c1b862a1a83ea40121e296'
+ 'b705242aae648a2554754880fb1c48d5415febe769a986df177b9792a6aefd27'
+ '7c127931f777d6655bf1323a7fd190b1b557a42bedb02017fa03d6afeee32b7a'
+ 'ca16192de33f8694a74220c3790a230d32c5576c663a34db050e0c2db9b0e002')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix run with Python 3.9
+ patch -Np1 -i ../0001-Remove-the-usage-of-deprecated-xml.etree.ElementTree.patch
+
+ # Fix run when GTK 4 is installed
+ patch -Np1 -i ../0001-Specify-required-versions-of-GI-components.patch
+
+ # Fix AppStream metadata validation
+ patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
+ sed -i 's|${datadir}/appdata|${datadir}/metainfo|' configure{,.ac}
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
More information about the arch-commits
mailing list