[vlc/f28: 11/11] Merge branch 'master' into f28
by Nicolas Chauvet
commit 135e35d64b146e0f911a03934104c49e343b645a
Merge: 5ad87c2 f09590a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jan 11 16:05:09 2019 +0100
Merge branch 'master' into f28
sources | 2 +-
vlc.spec | 81 +++++++++++++++++++++++++---------------------------------------
2 files changed, 33 insertions(+), 50 deletions(-)
---
5 years, 10 months
[vlc/f28] (11 commits) ...Merge branch 'master' into f28
by Nicolas Chauvet
Summary of changes:
c6c572d... Enable dav1d support (*)
3341d34... Restore jack obsoletes/provides (*)
aec9d7b... Only enable omxil on rpi for now (*)
874d90f... Update changelog (*)
54ffe0c... Fixup with_rpi (*)
2266d45... Fixup vdpau on core (*)
9d45139... Bump (*)
beddbaf... Clean-up gnome_vfs (*)
78350a3... Rework x11 moving to core (*)
f09590a... Update changelog (*)
135e35d... Merge branch 'master' into f28
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[vlc/f29] (3 commits) ...Update changelog
by Nicolas Chauvet
Summary of changes:
beddbaf... Clean-up gnome_vfs (*)
78350a3... Rework x11 moving to core (*)
f09590a... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[vlc] Update changelog
by Nicolas Chauvet
commit f09590aaf64f14d1401c7fb47cb9fb7a7d1057d5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 10 19:38:37 2019 +0100
Update changelog
sources | 2 +-
vlc.spec | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 1db38a5..d784f58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33ecd94ed9568bb19b4ca729eecca076 vlc-3.0.5.tar.xz
+4ff71d262e070fd19f86a1c3542c7b4e vlc-3.0.6.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 83f7a62..ed7d8bb 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -44,8 +44,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
-Version: 3.0.5
-Release: 14%{?dist}
+Version: 3.0.6
+Release: 15%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -545,6 +545,10 @@ fi || :
%changelog
+* Thu Jan 10 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.6-15
+- Update to 3.0.6
+- Rework xorg/wayland plugins moved to vlc-core
+
* Tue Jan 08 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.5-14
- Only enable mmal on rpi
- Fixup vdpau on core
5 years, 10 months
[vlc] Rework x11 moving to core
by Nicolas Chauvet
commit 78350a3100625e937d72c1a13317159c1f4717bc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 10 19:27:43 2019 +0100
Rework x11 moving to core
vlc.spec | 43 +++++--------------------------------------
1 file changed, 5 insertions(+), 38 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index bcc5426..83f7a62 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -456,26 +456,9 @@ fi || :
%{_bindir}/qvlc
%{_bindir}/svlc
%{_libdir}/vlc/*.so*
+# qt in main
%{_libdir}/vlc/plugins/gui/libqt_plugin.so
-%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
-%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
-%{?_with_wayland:
-%{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
-%{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so
-%{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so
-
-}
-%{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
-%{_libdir}/vlc/plugins/video_output/libgl_plugin.so
-%{_libdir}/vlc/plugins/video_output/libglx_plugin.so
-%{!?_without_xcb:
-%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
-%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
-%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
-%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-%{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
-%{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
-}
+# skin2 in main
%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_projectm:
%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
@@ -501,7 +484,6 @@ fi || :
%{_datadir}/vlc/
%{_libdir}/vlc/lua/
%{_libdir}/*.so.*
-%exclude %{_libdir}/vlc/plugins/gui/libqt_plugin.so
%exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{?_with_vcdimager:
%exclude %{_libdir}/vlc/plugins/access/libvcd_plugin.so
@@ -514,24 +496,9 @@ fi || :
%{?_with_fluidsynth:
%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
}
-%{!?_without_xcb:
-%exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
-%exclude %{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
-%exclude %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libgl_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libglx_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-}
-%{?_with_wayland:
-%exclude %{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so
-}
+%dir %{_libdir}/vlc/plugins/gui
+%{_libdir}/vlc/plugins/gui/libncurses_plugin.so
+%exclude %{_libdir}/vlc/plugins/gui/libqt_plugin.so
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_opencv:
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
5 years, 10 months
[vlc] Clean-up gnome_vfs
by Nicolas Chauvet
commit beddbafbef6a9c86db22aa2276dae55bf1da34c1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 8 14:30:47 2019 +0100
Clean-up gnome_vfs
vlc.spec | 6 ------
1 file changed, 6 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index c8f305b..bcc5426 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -457,9 +457,6 @@ fi || :
%{_bindir}/svlc
%{_libdir}/vlc/*.so*
%{_libdir}/vlc/plugins/gui/libqt_plugin.so
-%{?_with_gnomevfs:
-%{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
-}
%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{?_with_wayland:
@@ -505,9 +502,6 @@ fi || :
%{_libdir}/vlc/lua/
%{_libdir}/*.so.*
%exclude %{_libdir}/vlc/plugins/gui/libqt_plugin.so
-%{?_with_gnomevfs:
-%exclude %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
-}
%exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{?_with_vcdimager:
%exclude %{_libdir}/vlc/plugins/access/libvcd_plugin.so
5 years, 10 months
[openmw] Update to latest upstream release, 0.44
by Ben Rosser
commit b8d2872767c7d623e2fc814c06301143721105ce
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Wed Jan 9 22:04:07 2019 -0500
Update to latest upstream release, 0.44
This was delayed a bit because I needed to also rewrite the "unbundle tango
icons" patch, as something changed in the files it modifies for 0.44.
.gitignore | 1 +
openmw.spec | 10 +++++++---
openmw.undundle-tango-icons.patch | 20 +++++++++++---------
sources | 2 +-
4 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 596c7f7..aa69bd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ openmw-0.39.0.tar.gz
/openmw-0.40.0.tar.gz
/openmw-0.41.0.tar.gz
/openmw-0.43.0.tar.gz
+/openmw-0.44.0.tar.gz
diff --git a/openmw.spec b/openmw.spec
index c7fc8f9..6e3f13b 100644
--- a/openmw.spec
+++ b/openmw.spec
@@ -1,6 +1,6 @@
Name: openmw
-Version: 0.43.0
-Release: 5%{?dist}
+Version: 0.44.0
+Release: 1%{?dist}
Summary: Unofficial open source engine re-implementation of the game Morrowind
License: GPLv3 and MIT and zlib
@@ -118,7 +118,8 @@ rm -rf "%{buildroot}/%{_datadir}/licenses/%{name}/DejaVu Font License.txt"
mkdir -p %{buildroot}/%{_datadir}/%{name}/data
%files
-%doc docs/license/GPL3.txt README.md
+%license LICENSE
+%doc README.md
%{_bindir}/%{name}
%{_bindir}/%{name}-launcher
%{_bindir}/%{name}-iniimporter
@@ -138,6 +139,9 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/data
%changelog
+* Thu Jan 10 2019 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.0-1
+- Update to latest upstream release.
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.43.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/openmw.undundle-tango-icons.patch b/openmw.undundle-tango-icons.patch
index a34f107..5235d64 100644
--- a/openmw.undundle-tango-icons.patch
+++ b/openmw.undundle-tango-icons.patch
@@ -1,14 +1,15 @@
-diff -r -u openmw-openmw-0.37.0-old/files/launcher/launcher.qrc openmw-openmw-0.37.0/files/launcher/launcher.qrc
---- openmw-openmw-0.37.0-old/files/launcher/launcher.qrc 2015-11-22 19:54:17.000000000 +0100
-+++ openmw-openmw-0.37.0/files/launcher/launcher.qrc 2015-12-12 12:15:10.283705557 +0100
-@@ -7,16 +7,16 @@
+diff -rupN openmw-openmw-0.44.0/files/launcher/launcher.qrc openmw-patched/files/launcher/launcher.qrc
+--- openmw-openmw-0.44.0/files/launcher/launcher.qrc 2018-06-20 11:28:12.000000000 -0400
++++ openmw-patched/files/launcher/launcher.qrc 2019-01-09 21:44:07.430808674 -0500
+@@ -7,17 +7,17 @@
<file alias="openmw-header.png">images/openmw-header.png</file>
<file alias="playpage-background.png">images/playpage-background.png</file>
</qresource>
-<qresource prefix="icons/tango">
- <file alias="index.theme">icons/tango/index.theme</file>
-- <file alias="48x48/video-display.png">icons/tango/48x48/video-display.png</file>
+- <file alias="48x48/emblem-system.png">icons/tango/48x48/emblem-system.png</file>
- <file alias="48x48/preferences-system.png">icons/tango/48x48/preferences-system.png</file>
+- <file alias="48x48/video-display.png">icons/tango/48x48/video-display.png</file>
- <file alias="16x16/document-new.png">icons/tango/16x16/document-new.png</file>
- <file alias="16x16/edit-copy.png">icons/tango/16x16/edit-copy.png</file>
- <file alias="16x16/edit-delete.png">icons/tango/16x16/edit-delete.png</file>
@@ -18,8 +19,9 @@ diff -r -u openmw-openmw-0.37.0-old/files/launcher/launcher.qrc openmw-openmw-0.
- <file alias="16x16/go-up.png">icons/tango/16x16/go-up.png</file>
+<qresource prefix="/usr/share/icons/Tango">
+ <file alias="index.theme">/usr/share/icons/Tango/index.theme</file>
-+ <file alias="48x48/video-display.png">/usr/share/icons/Tango/24x24/devices/video-display.png</file>
++ <file alias="48x48/emblem-system.png">/usr/share/icons/Tango/24x24/emblems/emblem-system.png</file>
+ <file alias="48x48/preferences-system.png">/usr/share/icons/Tango/24x24/categories/preferences-system.png</file>
++ <file alias="48x48/video-display.png">/usr/share/icons/Tango/24x24/devices/video-display.png</file>
+ <file alias="16x16/document-new.png">/usr/share/icons/Tango/16x16/actions/document-new.png</file>
+ <file alias="16x16/edit-copy.png">/usr/share/icons/Tango/16x16/actions/edit-copy.png</file>
+ <file alias="16x16/edit-delete.png">/usr/share/icons/Tango/16x16/actions/edit-delete.png</file>
@@ -29,9 +31,9 @@ diff -r -u openmw-openmw-0.37.0-old/files/launcher/launcher.qrc openmw-openmw-0.
+ <file alias="16x16/go-up.png">/usr/share/icons/Tango/16x16/actions/go-up.png</file>
</qresource>
</RCC>
-diff -r -u openmw-openmw-0.37.0-old/files/wizard/wizard.qrc openmw-openmw-0.37.0/files/wizard/wizard.qrc
---- openmw-openmw-0.37.0-old/files/wizard/wizard.qrc 2015-11-22 19:54:17.000000000 +0100
-+++ openmw-openmw-0.37.0/files/wizard/wizard.qrc 2015-12-12 12:15:17.802096728 +0100
+diff -rupN openmw-openmw-0.44.0/files/wizard/wizard.qrc openmw-patched/files/wizard/wizard.qrc
+--- openmw-openmw-0.44.0/files/wizard/wizard.qrc 2018-06-20 11:28:12.000000000 -0400
++++ openmw-patched/files/wizard/wizard.qrc 2019-01-09 21:45:57.334498260 -0500
@@ -1,9 +1,9 @@
<RCC>
- <qresource prefix="icons/tango">
diff --git a/sources b/sources
index b53fd36..b0f2a7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-574e195228ea7d069b7b9eab7b6be221 openmw-0.43.0.tar.gz
+e7c63926f5dd7ecfe730c56773934355 openmw-0.44.0.tar.gz
5 years, 10 months
