[obs-studio] Fix #4436
by Momcilo Medic
commit 662f136782b0a632ad61435293ffccf35f0d0932
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Mon Jan 30 21:15:33 2017 +0100
Fix #4436
sources | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/sources b/sources
index 547a654..14c6206 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+2b845fff9881ea22fb42003dbedfd2f3 obs-studio-17.0.2.tar.gz
66b48f74345fa2e76a5e70920aee2c9e obs-ffmpeg-mux.patch
7 years, 2 months
[obs-studio/f25: 2/2] Fix #4436
by Momcilo Medic
commit 8aa449eecc2a32990bc1a7730be0ea3eef131184
Merge: f891b43 68a8ebc
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Mon Jan 30 20:59:54 2017 +0100
Fix #4436
.gitignore | 1 +
obs-studio.spec | 8 +++++++-
sources | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
---
7 years, 2 months
[obs-studio/f24] Fix #4436
by Momcilo Medic
Summary of changes:
68a8ebc... Fix #4436 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 2 months
[obs-studio] Fix #4436
by Momcilo Medic
commit 68a8ebc384ec922853bb57b02a0b3880cd5504bd
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Mon Jan 30 20:58:26 2017 +0100
Fix #4436
.gitignore | 1 +
obs-studio.spec | 8 +++++++-
sources | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3b3b68..b7df8e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/obs-studio-0.16.6.tar.gz
/obs-studio-17.0.0.tar.gz
/obs-studio-17.0.2.tar.gz
+/obs-ffmpeg-mux.patch
diff --git a/obs-studio.spec b/obs-studio.spec
index 3c480db..fcb7860 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,11 +1,12 @@
Name: obs-studio
Version: 17.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
URL: https://obsproject.com/
Source0: https://github.com/jp9000/obs-studio/archive/%{version}.tar.gz#/%{name}-%...
+Patch0: obs-ffmpeg-mux.patch
# Arm gcc has no xmmintrin.h file
ExclusiveArch: i686 x86_64
@@ -65,6 +66,7 @@ that use %{name}.
%prep
%setup -q
+%patch0 -p0
# rpmlint reports E: hardcoded-library-path
# replace OBS_MULTIARCH_SUFFIX by LIB_SUFFIX
@@ -129,6 +131,10 @@ fi
%changelog
+* Mon Jan 30 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 17.0.2-2
+- Reintroduced obs-ffmpeg-mux.patch
+- Fixes #4436
+
* Wed Jan 18 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 17.0.2-1
- Updated to 17.0.2
diff --git a/sources b/sources
index edf6c02..547a654 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b845fff9881ea22fb42003dbedfd2f3 obs-studio-17.0.2.tar.gz
+66b48f74345fa2e76a5e70920aee2c9e obs-ffmpeg-mux.patch
7 years, 2 months
[vlc/el6] Rebuilt again
by Nicolas Chauvet
commit f46ca8f0c48789adb0caf2fbf274f67e9cd8c922
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jan 30 10:30:01 2017 +0100
Rebuilt again
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index d5ed2d7..a8ebcec 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -31,7 +31,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 2.0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -533,6 +533,9 @@ fi || :
%changelog
+* Mon Jan 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.10-3
+- Rebuild for libdvbpsi#2
+
* Thu Jan 19 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.10-2
- Rebuild for epel libdvbpsi
- Opt-out directfb
7 years, 2 months
[vdr-xineliboutput/f24] Update to recent git version
by Martin Gansser
commit ecabeb084d750fa1f5d5b0e8151dc5220a03187e
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Jan 28 15:24:02 2017 +0100
Update to recent git version
vdr-xineliboutput.spec | 267 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 267 insertions(+)
---
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
new file mode 100644
index 0000000..6601cd7
--- /dev/null
+++ b/vdr-xineliboutput.spec
@@ -0,0 +1,267 @@
+%global xinever %(xine-config --version 2>/dev/null || echo ERROR)
+%global xineplugindir %(xine-config --plugindir 2>/dev/null || echo ERROR)
+%global xinepluginver 2.0.0
+%global pname xineliboutput
+%global vdrver %(vdr-config --version 2>/dev/null || echo ERROR)
+%global gitrev 29f7afd
+%global gitdate 20160607
+# build bluray support (disabled for now)
+%global have_bluray 1
+
+Name: vdr-%{pname}
+Version: 1.1.0
+Release: 19.%{gitdate}git%{gitrev}%{?dist}
+Summary: Plugins for watching VDR over Xine
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: http://sourceforge.net/projects/xineliboutput
+# checkout instructions
+# git clone git://git.code.sf.net/p/xineliboutput/git vdr-xineliboutput
+# cd vdr-xineliboutput
+# git rev-parse --short HEAD
+# git archive --format=tar.gz --prefix=vdr-xineliboutput/ %{gitrev} \
+# -o vdr-xineliboutput-%{version}-%{gitrev}.tar.gz
+Source0: %{name}-%{version}-%{gitrev}.tar.gz
+Source1: %{name}.conf
+Source2: allowed_hosts.conf
+
+BuildRequires: gettext
+BuildRequires: vdr-devel >= %{vdrver}
+BuildRequires: libextractor-devel >= 0.5.22
+BuildRequires: xine-lib-devel >= 1.1.9
+BuildRequires: libvdpau-devel >= 0.4.1
+BuildRequires: libX11-devel >= 1.3.4
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrender-devel
+BuildRequires: libcap-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: freeglut-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+BuildRequires: libXext-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: ffmpeg-devel
+
+Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
+Requires: libextractor >= 0.5.22
+Requires: xine-lib >= %{xinever}
+
+%if %{have_bluray}
+BuildRequires: libbluray-devel
+%endif
+
+%description
+VDR plugin: xine-lib based software output device for VDR
+
+This package contain plugin for Xine
+
+%package plugin
+Summary: Plugins for watching VDR over Xine
+Group: Applications/Multimedia
+License: GPLv2+
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Provides: libxineliboutput-fbfe.so = %{version}
+Provides: libxineliboutput-sxfe.so = %{version}
+
+%description plugin
+VDR plugin: xine-lib based software output device for VDR
+
+This package contain plugin for VDR
+
+%prep
+%setup -q -n %{name}
+
+./configure \
+ --enable-x11 \
+ --enable-fb \
+ --enable-vdr \
+ --enable-libxine \
+ --debug \
+%if !%{have_bluray}
+ --disable-libbluray \
+%endif
+ VDRDIR=%{vdr_plugindir} \
+ VDRINCDIR=%{_includedir} \
+ LOCALEDIR=./locale \
+ XINELIBOUTPUT_FB=1 \
+ XINELIBOUTPUT_X11=1 \
+ XINELIBOUTPUT_VDRPLUGIN=1 \
+ XINELIBOUTPUT_XINEPLUGIN=1
+
+%build
+FFMPEG_CFLAGS="$FFMPEG_CFLAGS $(${cross_prefix}pkg-config --cflags libavformat libavcodec libswscale libavutil)"
+export=FFMPEG_CFLAGS
+make CFLAGS="%{optflags} -fPIC $FFMPEG_CFLAGS" CXXFLAGS="%{optflags} -fPIC $FFMPEG_CFLAGS" %{?_smp_mflags} all
+
+%install
+install -dm 755 %{buildroot}%{xineplugindir}
+install -dm 755 %{buildroot}%{xineplugindir}/post
+install -dm 755 %{buildroot}%{vdr_plugindir}
+install -dm 755 %{buildroot}%{_bindir}
+install -dm 755 %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d
+install -dm 755 %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}
+install -dm 755 %{buildroot}%{_datadir}/vdr/xineliboutput
+install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d/xineliboutput.conf
+install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}/
+
+make install DESTDIR=%{buildroot}
+
+install -pm 755 mpg2c %{buildroot}%{_bindir}/mpg2c
+ln -s %{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-cvs \
+ %{buildroot}%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}
+ln -s %{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-cvs \
+ %{buildroot}%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}
+install -pm 644 black_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}
+install -pm 644 nosignal_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}
+install -pm 644 vdrlogo_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}
+ln -s nosignal_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}/nosignal.mpg
+
+
+# fix debug symbols extraction / stripping
+find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
+
+%find_lang %{name}
+
+%files -f %{name}.lang
+%doc HISTORY README*
+%license COPYING
+%{_bindir}/vdr-fbfe
+%{_bindir}/vdr-sxfe
+%{_bindir}/mpg2c
+
+%{xineplugindir}/xineplug_inp_xvdr.so
+%{xineplugindir}/post/xineplug_post_audiochannel.so
+%{xineplugindir}/post/xineplug_post_autocrop.so
+%{xineplugindir}/post/xineplug_post_swscale.so
+%{vdr_configdir}/plugins/%{pname}/
+
+%files plugin
+%dir %{vdr_configdir}/plugins/%{pname}
+%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+%config(noreplace) %{_sysconfdir}/vdr/plugins/%{pname}/allowed_hosts.conf
+
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
+%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}
+%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-cvs
+%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}
+%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-cvs
+
+
+%changelog
+* Sat Jan 28 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-19.20160607git29f7afd
+- Update to recent git version
+
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1.0-18.20160508git9027ea1
+- Rebuilt for ffmpeg-3.1.1
+
+* Sat Jul 02 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-17.20160508git9027ea1
+- Update to recent git version
+- Switched checkout command to git
+
+* Wed Apr 22 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-16.cvs20150422
+- Update to recent cvs version
+
+- Added patch %%{pname}_renamed_iDoubleTapTimeoutMs_in_libcec.diff
+* Tue Mar 03 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-15.cvs20150220
+- mark license files as %%license where available
+
+* Tue Mar 03 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-14.cvs20150220
+- Update to recent cvs version
+- Added patch %%{pname}_renamed_iDoubleTapTimeoutMs_in_libcec.diff
+
+* Mon Oct 20 2014 Sérgio Basto <sergio(a)serjux.com> - 1.1.0-13.cvs20140704
+- Rebuilt for FFmpeg 2.4.3
+
+* Thu Aug 07 2014 Sérgio Basto <sergio(a)serjux.com> - 1.1.0-12.cvs20140704
+- Rebuilt for ffmpeg-2.3
+
+* Fri Jul 04 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-11.cvs20140704
+- Update to recent cvs version
+
+* Thu May 29 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-10.cvs20140429
+- added %%dir %%{vdr_configdir}/plugins/%%{pname} to file section
+
+* Wed May 28 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-9.cvs20140429
+- added %%{vdr_configdir}/plugins/%%{pname} to file section because not owned
+- Use %%global instead of %%define
+
+* Wed May 28 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-8.cvs20140429
+- dropped LIBDIR option in configure section
+- removed DESTDIR=%%{buildroot}
+- removed macro %%defattr in file plugin section
+- removed configure flag DESTDIR
+- removed %%{vdr_configdir} in file section already owned by the vdr package
+- changed Requires tag in package plugins to %%{name}%%{?_isa} = %%{version}-%%{release}
+- added Requires vdr to main package
+
+* Wed May 28 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-7.cvs20140429
+- added global macro xinepluginver
+- corrected Source url
+
+* Tue May 27 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-6.cvs20140429
+- removed hardcoded ffmpeg CFLAGS option from configure
+- added FFMPEG_CFLAGS build flag
+- corrected link to xineplugins because of rpmlint warning W: dangling-relative-symlink
+
+* Mon May 26 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-5.cvs20140429
+- removed unused libdir path
+- replaced hardlink path in CFLAGS by macro
+- removed %%dir %%{vdr_plugindir} already owned by vdr/vdr-devel
+- removed macro %%defattr from file section
+- removed extra flag for building cvs build
+
+* Mon May 26 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-4.cvs20140429
+- Drop libbluray requires which rpmlint reports as error E: explicit-lib-dependency libbluray
+- Drop libvdpau requires which rpmlint reports as error E: explicit-lib-dependency libvdpau
+
+* Sun May 25 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-3.cvs20140429
+- changed hardlink into macros
+- changed release tag
+- Use %%global instead of %%define
+
+* Sun May 25 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-2.xine.1.2.5.vdr.2.0.5.cvs20140429
+- Update to recent cvs version
+
+ Fri May 23 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-1.xine.1.2.5.vdr.2.0.5
+- Update to 1.1.0
+- added CFLAGS and CXXFLAGS optflags
+- specfile cleanup
+
+* Fri Aug 17 2012 Zoran Pericic <zpericic(a)netst.org> - 1.0.90-27.xine.1.2.2.vdr.1.7.27.cvs20120817
+- update to cvs 20120817
+- xine-lib 1.2.2
+
+* Sun Jun 12 2011 Zoran Pericic <zpericic(a)netst.org> - 1.0.90-18.1.7.18.cvs20110611
+- xinelib 1.2
+- separate VDR plugin in separate subpackage
+- add bluray support (disabled for now)
+
+* Fri Jan 25 2008 Zoran Pericic <zpericic(a)inet.hr> - 1.0.3-2.0
+- xinelib 1.1.15-3
+- fedora 10
+
+* Fri Jan 25 2008 Zoran Pericic <zpericic(a)inet.hr> - 1.0.0-rc2.6
+- libs fix
+
+* Fri Jan 25 2008 Zoran Pericic <zpericic(a)inet.hr> - 1.0.0-rc2.6
+- install script fix
+- install vdr files
+
+* Fri Jan 25 2008 Zoran Pericic <zpericic(a)inet.hr> - 1.0.0-rc2.6
+- new xine-lib 1.1.9.1
+- install script fix
+- added i18n files
+
+* Mon Dec 17 2007 Zoran Pericic <zpericic(a)inet.hr> - 1.0.0-rc2.3
+- apiversion
+
+* Mon Dec 17 2007 Zoran Pericic <zpericic(a)inet.hr> - 1.0.0-rc2.2
+- Config file and specs changelog rework
+
+* Mon Dec 17 2007 Zoran Pericic <zpericic(a)inet.hr> - 1.0.0-rc2.1
+- Added config file
+
+* Mon Dec 17 2007 Zoran Pericic <zpericic(a)inet.hr> - 1.0.0-rc2
+- Initial build
7 years, 2 months
[vdr-xineliboutput/f24] Update to recent git version
by Martin Gansser
commit 8c583daae3e3d0e0630e67f46b621a5f2acea932
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Jan 28 13:35:52 2017 +0100
Update to recent git version
clog | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/clog b/clog
index 2786d88..2e074ca 100644
--- a/clog
+++ b/clog
@@ -1,3 +1 @@
Update to recent git version
-
-- Switched checkout command to git
7 years, 2 months
[vdr-xineliboutput/f24: 5/5] Merge branch 'master' into f24
by Martin Gansser
commit a44f9c2f1722252b50d8d407a7e6a8b43c887b8e
Merge: d1c30e6 0d3453d
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Jan 28 13:13:43 2017 +0100
Merge branch 'master' into f24
.gitignore | 2 -
sources | 1 -
vdr-xineliboutput-1.1.0-29f7afd.tar.gz | Bin 0 -> 412846 bytes
vdr-xineliboutput.spec | 261 ---------------------------------
4 files changed, 264 deletions(-)
---
diff --cc vdr-xineliboutput-1.1.0-29f7afd.tar.gz
index 0000000,0000000..1260395
new file mode 100644
Binary files differ
7 years, 2 months
[vdr-xineliboutput/f24] (5 commits) ...Merge branch 'master' into f24
by Martin Gansser
Summary of changes:
f57212c... Update to recent git version (*)
0abdff7... Update to recent git version (*)
0404d29... Rebuilt for ffmpeg-3.1.1 (*)
0d3453d... Update to recent git version (*)
a44f9c2... Merge branch 'master' into f24
(*) This commit already existed in another branch; no separate mail sent
7 years, 2 months
