[xpra-codecs-freeworld] Patched for building against ffmpeg-3.1 (f25)
by Antonio
commit e1f5c3fd37f65e059b55e0b4c910b6148e9eaf9f
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Jun 10 20:03:09 2017 +0200
Patched for building against ffmpeg-3.1 (f25)
...atch-to-allow-building-against-ffmpeg-3.1.patch | 28 ++++++++++++++++++++++
xpra-codecs-freeworld.spec | 12 +++++++++-
2 files changed, 39 insertions(+), 1 deletion(-)
---
diff --git a/xpra-codecs-freeworld-0002-Add-patch-to-allow-building-against-ffmpeg-3.1.patch b/xpra-codecs-freeworld-0002-Add-patch-to-allow-building-against-ffmpeg-3.1.patch
new file mode 100644
index 0000000..9f94a38
--- /dev/null
+++ b/xpra-codecs-freeworld-0002-Add-patch-to-allow-building-against-ffmpeg-3.1.patch
@@ -0,0 +1,28 @@
+--- xpra/codecs/enc_ffmpeg/encoder.orig.pyx 2017-03-17 08:24:28.000000000 +0100
++++ xpra/codecs/enc_ffmpeg/encoder.pyx 2017-05-10 12:23:37.728332187 +0200
+@@ -125,10 +125,10 @@
+ int FF_PROFILE_H264_HIGH
+ int FF_PROFILE_H264_HIGH_10
+ int FF_PROFILE_H264_HIGH_10_INTRA
+- int FF_PROFILE_H264_MULTIVIEW_HIGH
++# int FF_PROFILE_H264_MULTIVIEW_HIGH
+ int FF_PROFILE_H264_HIGH_422
+ int FF_PROFILE_H264_HIGH_422_INTRA
+- int FF_PROFILE_H264_STEREO_HIGH
++# int FF_PROFILE_H264_STEREO_HIGH
+ int FF_PROFILE_H264_HIGH_444
+ int FF_PROFILE_H264_HIGH_444_PREDICTIVE
+ int FF_PROFILE_H264_HIGH_444_INTRA
+@@ -446,10 +446,10 @@
+ FF_PROFILE_H264_HIGH : "high",
+ FF_PROFILE_H264_HIGH_10 : "high10",
+ FF_PROFILE_H264_HIGH_10_INTRA : "high10 intra",
+- FF_PROFILE_H264_MULTIVIEW_HIGH : "multiview high",
++# FF_PROFILE_H264_MULTIVIEW_HIGH : "multiview high",
+ FF_PROFILE_H264_HIGH_422 : "high422",
+ FF_PROFILE_H264_HIGH_422_INTRA : "high422 intra",
+- FF_PROFILE_H264_STEREO_HIGH : "stereo high",
++# FF_PROFILE_H264_STEREO_HIGH : "stereo high",
+ FF_PROFILE_H264_HIGH_444 : "high444",
+ FF_PROFILE_H264_HIGH_444_PREDICTIVE : "high444 predictive",
+ FF_PROFILE_H264_HIGH_444_INTRA : "high444 intra",
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 387ce94..18be44c 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -19,13 +19,16 @@
Name: xpra-codecs-freeworld
Version: 2.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: http://www.xpra.org/
Source0: http://xpra.org/src/xpra-%{version}.tar.xz
+##Patch for building xpra with ffmpeg-3.1
+Patch0: %{name}-0002-Add-patch-to-allow-building-against-ffmpeg-3.1.patch
+
BuildRequires: python2-devel pygobject2-devel pygtk2-devel
BuildRequires: libXtst-devel
BuildRequires: libxkbfile-devel, libvpx-devel
@@ -50,6 +53,10 @@ x264 and ffmpeg.
%prep
%setup -q -n xpra-%{version}
+%if 0%{?fedora} < 26
+%patch0 -p0
+%endif
+
%build
CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \
%{?_with_enc_x264} \
@@ -96,6 +103,9 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Wed May 10 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 2.0.2-2
+- Patched for building against ffmpeg-3.1 (f25)
+
* Tue May 09 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 2.0.2-1
- Update to 2.0.2
- webp option deprecated
7 years, 5 months
[qmplay2/f26] Update to 17.06.09
by Martin Gansser
Summary of changes:
fd5d4a7... Update to 17.06.09 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 5 months
[qmplay2] Update to 17.06.09
by Martin Gansser
commit fd5d4a7e25d6a0ca558c0184ce370db186e6b334
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Jun 10 19:29:24 2017 +0200
Update to 17.06.09
.gitignore | 1 +
qmplay2.spec | 11 ++++-------
sources | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd0fe60..d10a8d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/QMPlay2-src-17.03.17.tar.xz
/QMPlay2-src-17.04.02.tar.xz
/QMPlay2-src-17.04.21.tar.xz
+/QMPlay2-src-17.06.09.tar.xz
diff --git a/qmplay2.spec b/qmplay2.spec
index 0c9cd17..1ce0fe1 100644
--- a/qmplay2.spec
+++ b/qmplay2.spec
@@ -1,8 +1,8 @@
%global pname QMPlay2
Name: qmplay2
-Version: 17.04.21
-Release: 2%{?dist}
+Version: 17.06.09
+Release: 1%{?dist}
Summary: A Qt based media player, streamer and downloader
License: LGPLv3+
Url: http://zaps166.sourceforge.net/?app=QMPlay2
@@ -135,11 +135,8 @@ fi
%{_includedir}/%{pname}
%changelog
-* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 17.04.21-2
-- Rebuild for ffmpeg update
-
-* Sat Apr 22 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.04.21-1
-- Update to 17.04.21
+* Sat Jun 10 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.06.09-1
+- Update to 17.06.09
* Mon Apr 03 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.04.02-1
- Update to 17.04.02
diff --git a/sources b/sources
index cd9a372..6cca1af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13e3f72cf6272dee48d8d1e21de93beb QMPlay2-src-17.04.21.tar.xz
+ecdb256a6ccf0e9741abd82890a297ca QMPlay2-src-17.06.09.tar.xz
7 years, 5 months
[xorg-x11-drv-nvidia/f25] Remove GFX_PAYLOAD
by Nicolas Chauvet
commit 025190b5753d85f99089ab15207af0055763ff25
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 9 21:30:56 2017 +0200
Remove GFX_PAYLOAD
xorg-x11-drv-nvidia.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 930cdfc..5cbeed1 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -33,7 +33,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -400,8 +400,9 @@ if [ "$1" -eq "1" ]; then
fi || :
%if 0%{?fedora} || 0%{?rhel} >= 7
-%triggerin -- xorg-x11-drv-nvidia < 2:375.66-4
+%triggerun -- xorg-x11-drv-nvidia < 2:375.66-6
if [ -f %{_sysconfdir}/default/grub ] ; then
+ sed -i -e '/GRUB_GFXPAYLOAD_LINUX=text/d' %{_sysconfdir}/default/grub
. %{_sysconfdir}/default/grub
if [ -z "${GRUB_CMDLINE_LINUX+x}" ]; then
echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub
@@ -594,6 +595,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Fri Jun 02 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-6
+- Remove GRUB_GFXPAYLOAD_LINUX from default/grub
+
* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-5
- Update the triggerin to insert the new cmdline
- Avoid the nvidia modules to get added to the initramfs - patch by hansg
7 years, 5 months
[xorg-x11-drv-nvidia] Remove GFX_PAYLOAD
by Nicolas Chauvet
commit 403216aa89ede2a3376a5d4aadd961bddd6eb9a7
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 9 21:30:56 2017 +0200
Remove GFX_PAYLOAD
xorg-x11-drv-nvidia.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 930cdfc..5cbeed1 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -33,7 +33,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -400,8 +400,9 @@ if [ "$1" -eq "1" ]; then
fi || :
%if 0%{?fedora} || 0%{?rhel} >= 7
-%triggerin -- xorg-x11-drv-nvidia < 2:375.66-4
+%triggerun -- xorg-x11-drv-nvidia < 2:375.66-6
if [ -f %{_sysconfdir}/default/grub ] ; then
+ sed -i -e '/GRUB_GFXPAYLOAD_LINUX=text/d' %{_sysconfdir}/default/grub
. %{_sysconfdir}/default/grub
if [ -z "${GRUB_CMDLINE_LINUX+x}" ]; then
echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub
@@ -594,6 +595,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Fri Jun 02 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-6
+- Remove GRUB_GFXPAYLOAD_LINUX from default/grub
+
* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-5
- Update the triggerin to insert the new cmdline
- Avoid the nvidia modules to get added to the initramfs - patch by hansg
7 years, 5 months
[qmmp-plugins-freeworld] version bump to 1.1.9 add weak backwards dependency on qmmp (see also rhbz#1450271)
by Karel Volný
commit d0653e9f3218cb234f74cf91e4fe9ed266a4692f
Author: Karel Volny <kvolny(a)redhat.com>
Date: Fri Jun 9 09:09:07 2017 +0200
version bump to 1.1.9
add weak backwards dependency on qmmp (see also rhbz#1450271)
.gitignore | 1 +
qmmp-plugins-freeworld.spec | 10 ++++++++--
sources | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d62024..cb1d8fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ qmmp-0.9.6.tar.bz2
/qmmp-1.1.6.tar.bz2
/qmmp-1.1.7.tar.bz2
/qmmp-1.1.8.tar.bz2
+/qmmp-1.1.9.tar.bz2
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index b96cec6..cafddd7 100644
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.1.9
+Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -22,6 +22,8 @@ BuildRequires: qt5-qtbase-devel
BuildRequires: taglib-devel libcurl-devel
Requires: qmmp%{?_isa} = %{version}
+Supplements: qmmp
+
%description
Qmmp is an audio-player, written with help of Qt library.
This package contains plugins needed to play AAC, MPEG (.mp3) and WMA files,
@@ -171,6 +173,10 @@ fi
%changelog
+* Fri Jun 09 2017 Karel Volný <kvolny(a)redhat.com> 1.1.9-1
+- version bump to 1.1.9
+- add weak backwards dependency on qmmp (see also rhbz#1450271)
+
* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.8-2
- Rebuild for ffmpeg update
diff --git a/sources b/sources
index 544091c..cb9df70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b85b6901a66d3af28b9abfa577156c41 qmmp-1.1.8.tar.bz2
+7f41f0deb2b48b1e37fd96039ea977e8 qmmp-1.1.9.tar.bz2
7 years, 5 months