[gxine/f27] 0.5.909
by Xavier Bachelot
Summary of changes:
193c65d... 0.5.909 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
[gxine] 0.5.909
by Xavier Bachelot
commit 193c65da324bfbdf7a7a9fc095c463b688fd6fe5
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon Dec 18 21:47:52 2017 +0100
0.5.909
.gitignore | 1 +
gxine-0.5.909-fix_desktop_file.patch | 19 +++++++++++++++++++
gxine.spec | 11 +++++++++--
sources | 2 +-
4 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cdf30ac..fc9de76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gxine-0.5.908.tar.xz
+/gxine-0.5.909.tar.xz
diff --git a/gxine-0.5.909-fix_desktop_file.patch b/gxine-0.5.909-fix_desktop_file.patch
new file mode 100644
index 0000000..3be9b84
--- /dev/null
+++ b/gxine-0.5.909-fix_desktop_file.patch
@@ -0,0 +1,19 @@
+
+# HG changeset patch
+# User Petri Hintukainen <phintuka(a)users.sourceforge.net>
+# Date 1500574448 -10800
+# Node ID 317362021aae2d51a9c3f4940cee483dfcd38418
+# Parent 6303e64322ef2c8ac4c9dedf004616fb5455ec8e
+Fix desktop file
+
+diff -r 6303e64322ef -r 317362021aae gxine.desktop.in
+--- a/gxine.desktop.in Tue Jul 18 13:08:12 2017 +0300
++++ b/gxine.desktop.in Thu Jul 20 21:14:08 2017 +0300
+@@ -15,4 +15,4 @@
+ Type=Application
+ StartupNotify=true
+ Categories=AudioVideo;Video;GTK;Player;TV;
+-MimeType=x-content/video-dvd;x-content/audio-cdda;x-content/video-vcd;x-content/video-svcd;
++MimeType=x-content/video-dvd;x-content/audio-cdda;x-content/video-vcd;x-content/video-svcd;
+\ No newline at end of file
+
diff --git a/gxine.spec b/gxine.spec
index c919f0b..67b71b7 100644
--- a/gxine.spec
+++ b/gxine.spec
@@ -1,6 +1,6 @@
Name: gxine
-Version: 0.5.908
-Release: 4%{?dist}
+Version: 0.5.909
+Release: 1%{?dist}
Summary: GTK frontend for the xine multimedia library
License: GPLv2+
@@ -10,6 +10,8 @@ Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.xz
Patch1: gxine-0.5.902-non-separate-toolbar.patch
# some multilib issues
Patch3: gxine-0.5.907-lirc.patch
+# HG 2435
+Patch4: gxine-0.5.909-fix_desktop_file.patch
BuildRequires: js-devel
BuildRequires: desktop-file-utils
@@ -53,6 +55,7 @@ This plugin allows gxine to be embedded in a web browser.
%patch1 -p1 -b .non-separate-toolbar
%patch3 -p1 -b .lirc
+%patch4 -p1 -b .desktopfile
%{__sed} -i 's/Name=gxine/Name=GXine/' gxine.desktop.in
autoreconf -if
@@ -100,6 +103,7 @@ fi
%files -f %{name}.lang
%doc AUTHORS ChangeLog COPYING README TODO
%dir %{_sysconfdir}/gxine/
+%config(noreplace) %{_sysconfdir}/gxine/gtk.css
%config(noreplace) %{_sysconfdir}/gxine/gtkrc
%config(noreplace) %{_sysconfdir}/gxine/keypad.xml
%config(noreplace) %{_sysconfdir}/gxine/startup
@@ -118,6 +122,9 @@ fi
%{_libdir}/mozilla/plugins/gxineplugin.so
%changelog
+* Mon Dec 18 2017 Xavier Bachelot <xavier(a)bachelot.org> - 0.5.909-1
+- Update to 0.5.909.
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.5.908-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 24e5cb5..775f6a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a49618d8d1fdad9e7d15aee4cc5fd15f gxine-0.5.908.tar.xz
+1ecf5c74900ccb15b0fb0285d25a2466 gxine-0.5.909.tar.xz
6 years, 11 months
[chromium-freeworld/f26] (18 commits) ...Merge Fedora, chromium-63.0.3239.108-1
by Miro Hrončok
Summary of changes:
db2acc0... Remove support for running the unit tests (*)
06c182b... Adapt to man page changes for Chromium 63 (*)
8a70ade... Remove unused patches (*)
b8d27d6... Remove unused AppData file (*)
b0b7736... Merge #4 `Remove unused patches and an AppData file` (*)
07c88ef... Merge #3 `Remove support for running the unit tests` (*)
6af85f9... 63.0.3239.84 (*)
42ed338... fix aarch64 patch (*)
b18325e... new sources for aarch64 (*)
70ab91a... moar aarch64 files (*)
b9fa76f... moar moar aarch64 files (*)
3698ffd... moar moar aarch64 files (*)
eac1e39... moar moar moar aarch64 files (*)
7bb0a21... Don't require libcanberra-gtk2 GTK+ 3 build is enabled (*)
7d49b3d... Add missing ffmpeg files on aarch64 (*)
41a8870... Update to 63.0.3239.108 (*)
dfd304e... Add python2 as BR (*)
5f230f1... Merge Fedora, chromium-63.0.3239.108-1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
[chromium-freeworld/f27] (18 commits) ...Merge Fedora, chromium-63.0.3239.108-1
by Miro Hrončok
Summary of changes:
db2acc0... Remove support for running the unit tests (*)
06c182b... Adapt to man page changes for Chromium 63 (*)
8a70ade... Remove unused patches (*)
b8d27d6... Remove unused AppData file (*)
b0b7736... Merge #4 `Remove unused patches and an AppData file` (*)
07c88ef... Merge #3 `Remove support for running the unit tests` (*)
6af85f9... 63.0.3239.84 (*)
42ed338... fix aarch64 patch (*)
b18325e... new sources for aarch64 (*)
70ab91a... moar aarch64 files (*)
b9fa76f... moar moar aarch64 files (*)
3698ffd... moar moar aarch64 files (*)
eac1e39... moar moar moar aarch64 files (*)
7bb0a21... Don't require libcanberra-gtk2 GTK+ 3 build is enabled (*)
7d49b3d... Add missing ffmpeg files on aarch64 (*)
41a8870... Update to 63.0.3239.108 (*)
dfd304e... Add python2 as BR (*)
5f230f1... Merge Fedora, chromium-63.0.3239.108-1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
[ffmpeg/f27] Update changelog
by Nicolas Chauvet
commit 32de7275aa393723d9da3b79a94c9ca4d310854e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 17 21:14:43 2017 +0100
Update changelog
ffmpeg.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index e3490b2..f6e5ac1 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -75,7 +75,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 3.3.5
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -414,6 +414,10 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Dec 17 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.5-4
+- Enable vid.stab - rfbz#4713
+- Add _cuda_version rpm macro
+
* Mon Dec 11 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.5-3
- Backport patch for arm neon rfbz#4727
- Backport power and arm arch handling improvements for 3.3x
6 years, 11 months
[ffmpeg/f27] Add _cuda_version macro
by Nicolas Chauvet
commit 08d4766b6d04ff918d06aad226d2dbbaed082cdd
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 17 21:13:51 2017 +0100
Add _cuda_version macro
ffmpeg.spec | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b137dc5..e3490b2 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -48,14 +48,18 @@
%if 0%{!?_without_nvenc:1}
%global nvenc_cflags -I%{_includedir}/nvenc
%endif
-%if 0%{?_with_cuda}
-%global cuda_cflags $(pkg-config --cflags cuda-8.0)
+%if 0%{!?_cuda_version:1}
+%global _cuda_version 9.1
+%endif
+%global _cuda_rpm_version %(echo %{_cuda_version} | sed -e 's/\\./-/')
+%if 0%{?_with_cuda:1}
+%global cuda_cflags $(pkg-config --cflags cuda-%{cuda_version})
%global cuda_ldflags -L%{_libdir}/nvidia
%endif
%if 0%{?_with_libnpp}
-%global libnpp_cflags $(pkg-config --cflags nppi-8.0 nppc-8.0)
-%global libnpp_ldlags $(pkg-config --libs-only-L nppi-8.0 nppc-8.0)
+%global libnpp_cflags $(pkg-config --cflags nppi-%{_cuda_version} nppc-%{_cuda_version})
+%global libnpp_ldlags $(pkg-config --libs-only-L nppi-%{_cuda_version} nppc-%{_cuda_version})
%endif
%if 0%{?_without_gpl}
@@ -86,8 +90,8 @@ Patch1: LibOpenJPEG-2.3.patch
# Backport arm neon with recent binutils
Patch2: 0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%{?_with_cuda:BuildRequires: cuda-driver-dev-8-0 cuda-misc-headers-8-0 cuda-drivers-devel%{_isa}}
-%{?_with_libnpp:BuildRequires: cuda-cudart-dev-8-0 cuda-misc-headers-8-0 cuda-npp-dev-8-0}
+%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
+%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
6 years, 11 months
[ffmpeg/f27] Enable vid.stab - rfbz#4713
by Nicolas Chauvet
commit a535753d14d38a62f622cbdaf73b3950496159ee
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 17 18:55:43 2017 +0100
Enable vid.stab - rfbz#4713
ffmpeg.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 461d0dd..b137dc5 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -158,6 +158,7 @@ BuildRequires: subversion
BuildRequires: texinfo
%{?_with_twolame:BuildRequires: twolame-devel}
%{?_with_wavpack:BuildRequires: wavpack-devel}
+%{!?_without_vidstab:BuildRequires: vid.stab-devel}
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
%{!?_without_x265:BuildRequires: x265-devel}
%{!?_without_xvid:BuildRequires: xvidcore-devel}
@@ -270,6 +271,7 @@ This package contains development files for %{name}
%{?_with_twolame:--enable-libtwolame} \\\
--enable-libvorbis \\\
--enable-libv4l2 \\\
+ %{!?_without_vidstab:--enable-libvidstab} \\\
%{!?_without_vpx:--enable-libvpx} \\\
%{?_with_webp:--enable-libwebp} \\\
%{!?_without_x264:--enable-libx264} \\\
6 years, 11 months
[ffmpeg] Update changelog
by Nicolas Chauvet
commit 679b7133e1029da94b2a7333a1598a0da2b8a75f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 17 21:16:02 2017 +0100
Update changelog
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 823fe1a..adbcea7 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -75,7 +75,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 3.4.1
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -412,6 +412,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Dec 17 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.4.1-3
+- Add _cuda_version rpm macro
+
* Mon Dec 11 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.4.1-2
- Backport patch for arm neon rfbz#4727
6 years, 11 months