[gnome-mpv] fix
by Leigh Scott
commit 5a7b16cf6c1f326a6a013963ab0643ce1c8fff1b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Nov 23 09:09:53 2020 +0000
fix
gnome-mpv.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gnome-mpv.spec b/gnome-mpv.spec
index 728b8e5..3b9e564 100644
--- a/gnome-mpv.spec
+++ b/gnome-mpv.spec
@@ -15,7 +15,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.18
BuildRequires: intltool >= 0.40.6
BuildRequires: libappstream-glib
BuildRequires: pkgconfig(epoxy)
-BuildRequires: pkgconfig(mpv) >= 1.20
+BuildRequires: mpv-libs-devel
Requires: youtube-dl >= 2016.03.06
Requires: hicolor-icon-theme
3 years, 5 months
[mpc-qt] fix
by Leigh Scott
commit 80e546ad77c193af1e5b707b659ce7d04db99b6f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Nov 23 09:08:26 2020 +0000
fix
add_qthelper.patch | 435 +++++++++++++++++++++++++++++++++++++++++++++++++++++
mpc-qt.spec | 6 +-
2 files changed, 438 insertions(+), 3 deletions(-)
---
diff --git a/add_qthelper.patch b/add_qthelper.patch
new file mode 100644
index 0000000..12634d8
--- /dev/null
+++ b/add_qthelper.patch
@@ -0,0 +1,435 @@
+From 21a1bd753ba00891e6d89c5c501655f5df1df775 Mon Sep 17 00:00:00 2001
+From: Alexander Waldemar Ahjolinna <ahjolinna(a)yahoo.com>
+Date: Tue, 14 Apr 2020 21:30:42 +0300
+Subject: [PATCH] Fix for libmpv qthelper.hpp removal
+
+It was removed. A reasonable thing to do for projects relying on it is
+importing the version of it before deletion.
+
+(fix by wm4: https://github.com/wm4/mpc-qt)
+---
+ mpvwidget.cpp | 1 -
+ mpvwidget.h | 2 +-
+ qthelper.hpp | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 387 insertions(+), 2 deletions(-)
+ create mode 100644 qthelper.hpp
+
+diff --git a/mpvwidget.cpp b/mpvwidget.cpp
+index de6fe53..0596b6e 100644
+--- a/mpvwidget.cpp
++++ b/mpvwidget.cpp
+@@ -18,7 +18,6 @@
+ #include <QDebug>
+ #include <cmath>
+ #include <stdexcept>
+-#include <mpv/qthelper.hpp>
+ #include "mpvwidget.h"
+ #include "helpers.h"
+ #include "platform/unify.h"
+diff --git a/mpvwidget.h b/mpvwidget.h
+index cb2a29d..d88e286 100644
+--- a/mpvwidget.h
++++ b/mpvwidget.h
+@@ -10,9 +10,9 @@
+ #include <functional>
+ #include <mpv/client.h>
+ //#include <mpv/opengl_cb.h>
+-#include <mpv/qthelper.hpp>
+ #include <mpv/render.h>
+ #include <mpv/render_gl.h>
++#include "qthelper.hpp"
+ #include "helpers.h"
+
+ class QLayout;
+diff --git a/qthelper.hpp b/qthelper.hpp
+new file mode 100644
+index 0000000..3af86e3
+--- /dev/null
++++ b/qthelper.hpp
+@@ -0,0 +1,386 @@
++/* Copyright (C) 2017 the mpv developers
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef MPV_CLIENT_API_QTHELPER_H_
++#define MPV_CLIENT_API_QTHELPER_H_
++
++#include <mpv/client.h>
++
++#if !MPV_ENABLE_DEPRECATED
++#error "This helper is deprecated. Copy it into your project instead."
++#else
++
++/**
++ * Note: these helpers are provided for convenience for C++/Qt applications.
++ * This is based on the public API in client.h, and it does not encode any
++ * knowledge that is not known or guaranteed outside of the C client API. You
++ * can even copy and modify this code as you like, or implement similar things
++ * for other languages.
++ */
++
++#include <cstring>
++
++#include <QVariant>
++#include <QString>
++#include <QList>
++#include <QHash>
++#include <QSharedPointer>
++#include <QMetaType>
++
++namespace mpv {
++namespace qt {
++
++// Wrapper around mpv_handle. Does refcounting under the hood.
++class Handle
++{
++ struct container {
++ container(mpv_handle *h) : mpv(h) {}
++ ~container() { mpv_terminate_destroy(mpv); }
++ mpv_handle *mpv;
++ };
++ QSharedPointer<container> sptr;
++public:
++ // Construct a new Handle from a raw mpv_handle with refcount 1. If the
++ // last Handle goes out of scope, the mpv_handle will be destroyed with
++ // mpv_terminate_destroy().
++ // Never destroy the mpv_handle manually when using this wrapper. You
++ // will create dangling pointers. Just let the wrapper take care of
++ // destroying the mpv_handle.
++ // Never create multiple wrappers from the same raw mpv_handle; copy the
++ // wrapper instead (that's what it's for).
++ static Handle FromRawHandle(mpv_handle *handle) {
++ Handle h;
++ h.sptr = QSharedPointer<container>(new container(handle));
++ return h;
++ }
++
++ // Return the raw handle; for use with the libmpv C API.
++ operator mpv_handle*() const { return sptr ? (*sptr).mpv : 0; }
++};
++
++static inline QVariant node_to_variant(const mpv_node *node)
++{
++ switch (node->format) {
++ case MPV_FORMAT_STRING:
++ return QVariant(QString::fromUtf8(node->u.string));
++ case MPV_FORMAT_FLAG:
++ return QVariant(static_cast<bool>(node->u.flag));
++ case MPV_FORMAT_INT64:
++ return QVariant(static_cast<qlonglong>(node->u.int64));
++ case MPV_FORMAT_DOUBLE:
++ return QVariant(node->u.double_);
++ case MPV_FORMAT_NODE_ARRAY: {
++ mpv_node_list *list = node->u.list;
++ QVariantList qlist;
++ for (int n = 0; n < list->num; n++)
++ qlist.append(node_to_variant(&list->values[n]));
++ return QVariant(qlist);
++ }
++ case MPV_FORMAT_NODE_MAP: {
++ mpv_node_list *list = node->u.list;
++ QVariantMap qmap;
++ for (int n = 0; n < list->num; n++) {
++ qmap.insert(QString::fromUtf8(list->keys[n]),
++ node_to_variant(&list->values[n]));
++ }
++ return QVariant(qmap);
++ }
++ default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
++ return QVariant();
++ }
++}
++
++struct node_builder {
++ node_builder(const QVariant& v) {
++ set(&node_, v);
++ }
++ ~node_builder() {
++ free_node(&node_);
++ }
++ mpv_node *node() { return &node_; }
++private:
++ Q_DISABLE_COPY(node_builder)
++ mpv_node node_;
++ mpv_node_list *create_list(mpv_node *dst, bool is_map, int num) {
++ dst->format = is_map ? MPV_FORMAT_NODE_MAP : MPV_FORMAT_NODE_ARRAY;
++ mpv_node_list *list = new mpv_node_list();
++ dst->u.list = list;
++ if (!list)
++ goto err;
++ list->values = new mpv_node[num]();
++ if (!list->values)
++ goto err;
++ if (is_map) {
++ list->keys = new char*[num]();
++ if (!list->keys)
++ goto err;
++ }
++ return list;
++ err:
++ free_node(dst);
++ return NULL;
++ }
++ char *dup_qstring(const QString &s) {
++ QByteArray b = s.toUtf8();
++ char *r = new char[b.size() + 1];
++ if (r)
++ std::memcpy(r, b.data(), b.size() + 1);
++ return r;
++ }
++ bool test_type(const QVariant &v, QMetaType::Type t) {
++ // The Qt docs say: "Although this function is declared as returning
++ // "QVariant::Type(obsolete), the return value should be interpreted
++ // as QMetaType::Type."
++ // So a cast really seems to be needed to avoid warnings (urgh).
++ return static_cast<int>(v.type()) == static_cast<int>(t);
++ }
++ void set(mpv_node *dst, const QVariant &src) {
++ if (test_type(src, QMetaType::QString)) {
++ dst->format = MPV_FORMAT_STRING;
++ dst->u.string = dup_qstring(src.toString());
++ if (!dst->u.string)
++ goto fail;
++ } else if (test_type(src, QMetaType::Bool)) {
++ dst->format = MPV_FORMAT_FLAG;
++ dst->u.flag = src.toBool() ? 1 : 0;
++ } else if (test_type(src, QMetaType::Int) ||
++ test_type(src, QMetaType::LongLong) ||
++ test_type(src, QMetaType::UInt) ||
++ test_type(src, QMetaType::ULongLong))
++ {
++ dst->format = MPV_FORMAT_INT64;
++ dst->u.int64 = src.toLongLong();
++ } else if (test_type(src, QMetaType::Double)) {
++ dst->format = MPV_FORMAT_DOUBLE;
++ dst->u.double_ = src.toDouble();
++ } else if (src.canConvert<QVariantList>()) {
++ QVariantList qlist = src.toList();
++ mpv_node_list *list = create_list(dst, false, qlist.size());
++ if (!list)
++ goto fail;
++ list->num = qlist.size();
++ for (int n = 0; n < qlist.size(); n++)
++ set(&list->values[n], qlist[n]);
++ } else if (src.canConvert<QVariantMap>()) {
++ QVariantMap qmap = src.toMap();
++ mpv_node_list *list = create_list(dst, true, qmap.size());
++ if (!list)
++ goto fail;
++ list->num = qmap.size();
++ for (int n = 0; n < qmap.size(); n++) {
++ list->keys[n] = dup_qstring(qmap.keys()[n]);
++ if (!list->keys[n]) {
++ free_node(dst);
++ goto fail;
++ }
++ set(&list->values[n], qmap.values()[n]);
++ }
++ } else {
++ goto fail;
++ }
++ return;
++ fail:
++ dst->format = MPV_FORMAT_NONE;
++ }
++ void free_node(mpv_node *dst) {
++ switch (dst->format) {
++ case MPV_FORMAT_STRING:
++ delete[] dst->u.string;
++ break;
++ case MPV_FORMAT_NODE_ARRAY:
++ case MPV_FORMAT_NODE_MAP: {
++ mpv_node_list *list = dst->u.list;
++ if (list) {
++ for (int n = 0; n < list->num; n++) {
++ if (list->keys)
++ delete[] list->keys[n];
++ if (list->values)
++ free_node(&list->values[n]);
++ }
++ delete[] list->keys;
++ delete[] list->values;
++ }
++ delete list;
++ break;
++ }
++ default: ;
++ }
++ dst->format = MPV_FORMAT_NONE;
++ }
++};
++
++/**
++ * RAII wrapper that calls mpv_free_node_contents() on the pointer.
++ */
++struct node_autofree {
++ mpv_node *ptr;
++ node_autofree(mpv_node *a_ptr) : ptr(a_ptr) {}
++ ~node_autofree() { mpv_free_node_contents(ptr); }
++};
++
++#if MPV_ENABLE_DEPRECATED
++
++/**
++ * Return the given property as mpv_node converted to QVariant, or QVariant()
++ * on error.
++ *
++ * @deprecated use get_property() instead
++ *
++ * @param name the property name
++ */
++static inline QVariant get_property_variant(mpv_handle *ctx, const QString &name)
++{
++ mpv_node node;
++ if (mpv_get_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, &node) < 0)
++ return QVariant();
++ node_autofree f(&node);
++ return node_to_variant(&node);
++}
++
++/**
++ * Set the given property as mpv_node converted from the QVariant argument.
++
++ * @deprecated use set_property() instead
++ */
++static inline int set_property_variant(mpv_handle *ctx, const QString &name,
++ const QVariant &v)
++{
++ node_builder node(v);
++ return mpv_set_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * Set the given option as mpv_node converted from the QVariant argument.
++ *
++ * @deprecated use set_property() instead
++ */
++static inline int set_option_variant(mpv_handle *ctx, const QString &name,
++ const QVariant &v)
++{
++ node_builder node(v);
++ return mpv_set_option(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * mpv_command_node() equivalent. Returns QVariant() on error (and
++ * unfortunately, the same on success).
++ *
++ * @deprecated use command() instead
++ */
++static inline QVariant command_variant(mpv_handle *ctx, const QVariant &args)
++{
++ node_builder node(args);
++ mpv_node res;
++ if (mpv_command_node(ctx, node.node(), &res) < 0)
++ return QVariant();
++ node_autofree f(&res);
++ return node_to_variant(&res);
++}
++
++#endif
++
++/**
++ * This is used to return error codes wrapped in QVariant for functions which
++ * return QVariant.
++ *
++ * You can use get_error() or is_error() to extract the error status from a
++ * QVariant value.
++ */
++struct ErrorReturn
++{
++ /**
++ * enum mpv_error value (or a value outside of it if ABI was extended)
++ */
++ int error;
++
++ ErrorReturn() : error(0) {}
++ explicit ErrorReturn(int err) : error(err) {}
++};
++
++/**
++ * Return the mpv error code packed into a QVariant, or 0 (success) if it's not
++ * an error value.
++ *
++ * @return error code (<0) or success (>=0)
++ */
++static inline int get_error(const QVariant &v)
++{
++ if (!v.canConvert<ErrorReturn>())
++ return 0;
++ return v.value<ErrorReturn>().error;
++}
++
++/**
++ * Return whether the QVariant carries a mpv error code.
++ */
++static inline bool is_error(const QVariant &v)
++{
++ return get_error(v) < 0;
++}
++
++/**
++ * Return the given property as mpv_node converted to QVariant, or QVariant()
++ * on error.
++ *
++ * @param name the property name
++ * @return the property value, or an ErrorReturn with the error code
++ */
++static inline QVariant get_property(mpv_handle *ctx, const QString &name)
++{
++ mpv_node node;
++ int err = mpv_get_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, &node);
++ if (err < 0)
++ return QVariant::fromValue(ErrorReturn(err));
++ node_autofree f(&node);
++ return node_to_variant(&node);
++}
++
++/**
++ * Set the given property as mpv_node converted from the QVariant argument.
++ *
++ * @return mpv error code (<0 on error, >= 0 on success)
++ */
++static inline int set_property(mpv_handle *ctx, const QString &name,
++ const QVariant &v)
++{
++ node_builder node(v);
++ return mpv_set_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * mpv_command_node() equivalent.
++ *
++ * @param args command arguments, with args[0] being the command name as string
++ * @return the property value, or an ErrorReturn with the error code
++ */
++static inline QVariant command(mpv_handle *ctx, const QVariant &args)
++{
++ node_builder node(args);
++ mpv_node res;
++ int err = mpv_command_node(ctx, node.node(), &res);
++ if (err < 0)
++ return QVariant::fromValue(ErrorReturn(err));
++ node_autofree f(&res);
++ return node_to_variant(&res);
++}
++
++}
++}
++
++Q_DECLARE_METATYPE(mpv::qt::ErrorReturn)
++
++#endif /* else #if MPV_ENABLE_DEPRECATED */
++
++#endif
diff --git a/mpc-qt.spec b/mpc-qt.spec
index 17dc4dc..2900bce 100644
--- a/mpc-qt.spec
+++ b/mpc-qt.spec
@@ -5,19 +5,19 @@ Summary: A clone of Media Player Classic reimplemented in Qt
License: GPLv2+
URL: https://github.com/cmdrkotori/mpc-qt
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+# based on https://github.com/ahjolinna/mpc-qt/commit/21a1bd753ba00891e6d89c5c501655...
+Patch0: add_qthelper.patch
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
-BuildRequires: pkgconfig(mpv)
+BuildRequires: mpv-libs-devel
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
-%if 0%{?fedora} >= 32
BuildRequires: qt5-qtbase-private-devel
-%endif
BuildRequires: qt5-linguist
%description
3 years, 5 months
[vdr-mpv] Rebuild for new mpv
by Leigh Scott
commit bcfb11edf54090e9d6aa2a33b9468058f49c7052
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Nov 23 08:46:45 2020 +0000
Rebuild for new mpv
vdr-mpv.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vdr-mpv.spec b/vdr-mpv.spec
index fdd0875..5261378 100644
--- a/vdr-mpv.spec
+++ b/vdr-mpv.spec
@@ -2,7 +2,7 @@
Name: vdr-%{pname}
Version: 0.0.4
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: A mpv player plugin for VDR
License: AGPLv3+
URL: http://projects.vdr-developer.org/projects/plg-mpv
@@ -38,6 +38,9 @@ make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
%changelog
+* Mon Nov 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.0.4-18
+- Rebuild for new mpv
+
* Wed Oct 21 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 0.0.4-17
- Rebuilt for new VDR API version
3 years, 5 months
[plex-media-player] Rebuild for new mpv
by Leigh Scott
commit 5e19abfc6057f8c3dfdb9f846ebd56f1ec535c8c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Nov 23 08:45:47 2020 +0000
Rebuild for new mpv
plex-media-player.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index a2ab3ed..184452e 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -9,7 +9,7 @@
Name: plex-media-player
Version: 2.58.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plex Media Player
License: GPLv2+
@@ -209,6 +209,9 @@ exit 0
%{_unitdir}/%{name}.target
%changelog
+* Mon Nov 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-6
+- Rebuild for new mpv
+
* Sat Sep 12 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-5
- Rebuild for libcec
3 years, 5 months
[mpc-qt] Rebuild for new mpv
by Leigh Scott
commit 9a5bfb8dc118bce0860aa6eb3795a446cfe9f22f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Nov 23 08:43:58 2020 +0000
Rebuild for new mpv
mpc-qt.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/mpc-qt.spec b/mpc-qt.spec
index bd80846..17dc4dc 100644
--- a/mpc-qt.spec
+++ b/mpc-qt.spec
@@ -1,6 +1,6 @@
Name: mpc-qt
Version: 18.08
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A clone of Media Player Classic reimplemented in Qt
License: GPLv2+
URL: https://github.com/cmdrkotori/mpc-qt
@@ -52,6 +52,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mpc-qt.desktop
%changelog
+* Mon Nov 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 18.08-5
+- Rebuild for new mpv
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 18.08-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 5 months
[gnome-mpv] Rebuild for new mpv
by Leigh Scott
commit 1812dd3bb8b1436786867be0a43c119e21ac5718
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Nov 23 08:42:56 2020 +0000
Rebuild for new mpv
gnome-mpv.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gnome-mpv.spec b/gnome-mpv.spec
index ec8cce7..728b8e5 100644
--- a/gnome-mpv.spec
+++ b/gnome-mpv.spec
@@ -1,6 +1,6 @@
Name: gnome-mpv
Version: 0.16
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A simple GTK+ frontend for mpv
License: GPLv3+
@@ -53,6 +53,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/io.github.GnomeMpv.de
%{_mandir}/man1/%{name}.1.gz
%changelog
+* Mon Nov 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.16-6
+- Rebuild for new mpv
+
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.16-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 5 months
[deepin-movie] Rebuild for new mpv
by Leigh Scott
commit 6b0128efb4c275845c68962de7242ecfffea463f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Nov 23 08:41:55 2020 +0000
Rebuild for new mpv
deepin-movie.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/deepin-movie.spec b/deepin-movie.spec
index 8f4df82..412e31f 100644
--- a/deepin-movie.spec
+++ b/deepin-movie.spec
@@ -2,7 +2,7 @@
Name: deepin-movie
Version: 3.2.24.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Deepin movie based on mpv
Summary(zh_CN): 深度影音
License: GPLv3
@@ -87,6 +87,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%{_libdir}/libdmr.so
%changelog
+* Mon Nov 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.2.24.3-5
+- Rebuild for new mpv
+
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.2.24.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 5 months
[celluloid] Rebuild for new mpv
by Leigh Scott
commit 1ab28b8b67e9d80fc6cd9b6393c7c8a6697c8400
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Nov 23 08:37:28 2020 +0000
Rebuild for new mpv
celluloid.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/celluloid.spec b/celluloid.spec
index 2e04f50..ffbb579 100644
--- a/celluloid.spec
+++ b/celluloid.spec
@@ -1,6 +1,6 @@
Name: celluloid
Version: 0.20
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A simple GTK+ frontend for mpv
License: GPLv3+
@@ -56,6 +56,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/io.github.celluloid_p
%{_mandir}/man1/%{name}.1.*
%changelog
+* Mon Nov 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.20-2
+- Rebuild for new mpv
+
* Sat Sep 19 2020 Vasiliy N. Glazov <vascom2(a)gmail.com> - 0.20-1
- Update to 0.20
3 years, 5 months
[x264] Update x264 to api 0.161 (stable branch)
by Sérgio M. Basto
commit df59d86d1a8afb7934eab4868c3e7475961ca1c6
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Nov 23 01:17:13 2020 +0000
Update x264 to api 0.161 (stable branch)
7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff | 48 ---------------------------
x264-gpac.patch | 14 ++++----
x264.spec | 17 +++++-----
3 files changed, 16 insertions(+), 63 deletions(-)
---
diff --git a/x264-gpac.patch b/x264-gpac.patch
index 97f4cd9..21295fe 100644
--- a/x264-gpac.patch
+++ b/x264-gpac.patch
@@ -1,13 +1,13 @@
---- ./configure.orig 2019-03-12 00:41:42.000000000 +0000
-+++ ./configure 2019-03-12 01:10:12.603640526 +0000
-@@ -1207,7 +1207,9 @@ fi
+--- ./configure.orig 2020-11-22 22:49:29.765327990 +0000
++++ ./configure 2020-11-23 01:07:38.050590012 +0000
+@@ -1244,9 +1244,7 @@ fi
+
if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
gpac="no"
- GPAC_LIBS="-lgpac_static"
+- GPAC_LIBS="-lgpac_static"
- cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
-+ for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjp2; do
-+ cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
-+ done
+- cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"
++ GPAC_LIBS="$($PKGCONFIG --static --libs gpac)"
if [ "$SYS" = "WINDOWS" ] ; then
cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"
diff --git a/x264.spec b/x264.spec
index 0724985..ad5a90a 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,7 +1,7 @@
-# globals for x264-0.160-20200702gitcde9a93.tar.bz2
-%global api 160
-%global gitdate 20200702
-%global gitversion cde9a93
+# globals for x264-0.161-20200912gitd198931.tar.bz2
+%global api 161
+%global gitdate 20200912
+%global gitversion d198931
%global snapshot %{gitdate}git%{gitversion}
%global gver .%{gitdate}git%{gitversion}
@@ -41,7 +41,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 2%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 1%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -53,10 +53,9 @@ Patch0: x264-nover.patch
Patch1: x264-10b.patch
Patch10: x264-gpac.patch
Patch11: x264-opencl.patch
-Patch12: 7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff
BuildRequires: gcc
-%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel xz-devel libglvnd-devel mesa-libGLU-devel faad2-devel libmad-devel xvidcore-devel a52dec-devel libvorbis-devel libtheora-devel openjpeg2-devel }
+%{!?_without_gpac:BuildRequires: gpac-static >= 1.0.1 zlib-devel openssl-devel libpng-devel libjpeg-devel xz-devel libglvnd-devel mesa-libGLU-devel faad2-devel libmad-devel xvidcore-devel a52dec-devel libvorbis-devel libtheora-devel openjpeg2-devel }
%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=3975
@@ -111,7 +110,6 @@ pushd %{name}-0.%{api}-%{snapshot}
%patch1 -p1 -b .10b
%patch10 -p1 -b .gpac
%patch11 -p1 -b .opencl
-%patch12 -p1 -b .gpac8
popd
variants="generic generic10"
@@ -219,6 +217,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Wed Nov 18 2020 Sérgio Basto <sergio(a)serjux.com> - 0.161-1.20200912gitd198931
+- Update x264 to api 0.161 (stable branch)
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.160-2.20200702gitcde9a93
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 5 months
[gpac/f33] Update to 1.0.1
by Sérgio M. Basto
Summary of changes:
8835403... Update to 1.0.1 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 5 months