[obs-studio/f25: 2/2] Merge branch 'master' into f25
by Martin Gansser
commit 67f51ea0df5f58746ac64772cfeb22497a5beff1
Merge: 005a2b2 f8034c4
Author: martinkg(a)fedoraproject.org <martinkg(a)fedoraproject.org>
Date: Tue Oct 17 14:49:21 2017 +0200
Merge branch 'master' into f25
obs-studio.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
6 years, 6 months
[obs-studio/f26] Updated to 20.0.1
by Martin Gansser
Summary of changes:
f8034c4... Updated to 20.0.1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 6 months
[obs-studio/f27] Updated to 20.0.1
by Martin Gansser
Summary of changes:
f8034c4... Updated to 20.0.1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 6 months
[pianobar] Update to latest upstream release.
by Leigh Scott
commit fe3ccd85ca22af5a56e79d9426d296b3845f0fe1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Oct 17 13:41:26 2017 +0100
Update to latest upstream release.
.gitignore | 1 +
pianobar.spec | 13 ++++++++-----
sources | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f84e36..49c3821 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/pianobar-2016.06.02.tar.bz2
+/pianobar-2017.08.30.tar.bz2
diff --git a/pianobar.spec b/pianobar.spec
index e54b009..47d21c2 100644
--- a/pianobar.spec
+++ b/pianobar.spec
@@ -1,8 +1,6 @@
-%global debug_package %{nil}
-
Name: pianobar
-Version: 2016.06.02
-Release: 4%{?dist}
+Version: 2017.08.30
+Release: 1%{?dist}
Summary: Console-based client for Pandora
License: MIT
@@ -36,9 +34,10 @@ Features
%prep
%autosetup
touch configure
-
+chmod a+x configure
%build
+%configure
%make_build V=1
@@ -54,6 +53,10 @@ touch configure
%changelog
+* Tue Oct 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2017.08.30-1
+- Update to latest upstream release.
+- Fix debuginfo issue (actually call configure)
+
* Fri Sep 01 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2016.06.02-4
- Disable debuginfo
diff --git a/sources b/sources
index ecaa7e6..3487155 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0fc71e7cd3840db43943dde60a781227 pianobar-2016.06.02.tar.bz2
+2af4ad10af1e11a8f3cace474320ca4a pianobar-2017.08.30.tar.bz2
6 years, 6 months
[obs-studio] Updated to 20.0.1
by Martin Gansser
commit f8034c477cef44e1cf90ac2d466add8e4773126a
Author: martinkg(a)fedoraproject.org <martinkg(a)fedoraproject.org>
Date: Tue Oct 17 14:41:03 2017 +0200
Updated to 20.0.1
obs-studio.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index e5f14c8..903c41a 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,5 +1,5 @@
Name: obs-studio
-Version: 20.0.0
+Version: 20.0.1
Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
@@ -131,6 +131,9 @@ fi
%changelog
+* Tue Oct 17 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 20.0.1-1
+- Updated to 20.0.1
+
* Thu Aug 10 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 20.0.0-1
- Updated to 20.0.0
diff --git a/sources b/sources
index ff7a73d..418d9cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb443ee4c3783200f93d4271962e65ad obs-studio-20.0.0.tar.gz
+fe12017a573ad0f0b9f90b1d8f631ce6 obs-studio-20.0.1.tar.gz
6 years, 6 months
[mplayer] Rebuild for ffmpeg update
by Leigh Scott
commit d0f50cffc888feb1725e24e0504853e74ab73467
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Oct 17 11:16:50 2017 +0100
Rebuild for ffmpeg update
mplayer-add-include_vdpau_x11.patch | 23 +++++++++++++++++++++++
mplayer.spec | 10 ++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/mplayer-add-include_vdpau_x11.patch b/mplayer-add-include_vdpau_x11.patch
new file mode 100644
index 0000000..3c2891b
--- /dev/null
+++ b/mplayer-add-include_vdpau_x11.patch
@@ -0,0 +1,23 @@
+From 2fe876f5ed67edd72e6da4fd0ccaae03a1952d4c Mon Sep 17 00:00:00 2001
+From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2>
+Date: Wed, 19 Apr 2017 23:06:04 +0000
+Subject: [PATCH] vo_vdpau: Explicitly include header vdpau_x11.h
+
+The include from inside libavcodec/vdpau.h was removed in FFmpeg
+commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
+---
+ libvo/vo_vdpau.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
+index 7b94cad1b9..99f08d6c7b 100644
+--- a/libvo/vo_vdpau.c
++++ b/libvo/vo_vdpau.c
+@@ -34,6 +34,7 @@
+
+ #include <stdio.h>
+ #include <strings.h>
++#include <vdpau/vdpau_x11.h>
+
+ #include "config.h"
+ #include "sub/ass_mp.h"
diff --git a/mplayer.spec b/mplayer.spec
index fcab644..a210ef2 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -7,9 +7,9 @@
Name: mplayer
Version: 1.3.0
%if 0%{?svn}
-Release: 41.%{?pre}%{?dist}
+Release: 42.%{?pre}%{?dist}
%else
-Release: 11%{?dist}
+Release: 12%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -41,6 +41,7 @@ Patch4: %{name}-fix-screenshot-crash.patch
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4470
# Patch is from an upstream svn commit
Patch5: %{name}-fix-vo_png.patch
+Patch6: %{name}-add-include_vdpau_x11.patch
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
@@ -236,6 +237,7 @@ rm -rf ffmpeg
%patch3 -p1 -b .ffmpeg
%patch4 -p1 -b .screenshot
%patch5 -p1 -b .vo_png
+%patch6 -p1 -b .vdpau_x11
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -391,6 +393,10 @@ update-desktop-database &>/dev/null || :
%{_datadir}/mplayer/*.fp
%changelog
+* Tue Oct 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-12
+- Rebuild for ffmpeg update
+- Add build upstream build fix for newer ffmpeg
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.3.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 6 months