[vlc] Clean-up old f30 patch
by Nicolas Chauvet
commit 813743980e549a9a930bde5b2d1f4a7097656881
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 16 08:12:58 2020 +0200
Clean-up old f30 patch
vlc.spec | 3 ---
1 file changed, 3 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 698a6e9..f70b0d0 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -313,9 +313,6 @@ VLC media player extras modules.
%patch1 -p1
%endif
%patch3 -p1
-%if 0%{?fedora} == 30
-%patch4 -p1
-%endif
%if 0%{?el7}
%patch5 -p1
# Lower opus requirement - rfbz#5585
4 years, 5 months
[openmw] Update to latest upstraem release, 0.46.0.
by Ben Rosser
commit 726339279c5759b7f53a35888c1b6d8af8161a02
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Jun 15 20:29:52 2020 -0400
Update to latest upstraem release, 0.46.0.
.gitignore | 2 ++
openmw-foreach-offmeshconnectionsmanager.patch | 11 +++++++++++
openmw.spec | 23 ++++++++++++++++-------
sources | 2 +-
4 files changed, 30 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20222df..fef5569 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.src.rpm
openmw-0.36.1.tar.gz
openmw-0.37.0.tar.gz
openmw-0.38.0.tar.gz
@@ -7,3 +8,4 @@ openmw-0.39.0.tar.gz
/openmw-0.43.0.tar.gz
/openmw-0.44.0.tar.gz
/openmw-0.45.0.tar.gz
+/openmw-0.46.0.tar.gz
diff --git a/openmw-foreach-offmeshconnectionsmanager.patch b/openmw-foreach-offmeshconnectionsmanager.patch
new file mode 100644
index 0000000..6ba090f
--- /dev/null
+++ b/openmw-foreach-offmeshconnectionsmanager.patch
@@ -0,0 +1,11 @@
+diff -rupN openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp openmw-patched/components/detournavigator/offmeshconnectionsmanager.hpp
+--- openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp 2020-06-08 05:11:24.000000000 -0400
++++ openmw-patched/components/detournavigator/offmeshconnectionsmanager.hpp 2020-06-15 19:18:07.319909847 -0400
+@@ -13,6 +13,7 @@
+
+ #include <boost/optional.hpp>
+
++#include <algorithm>
+ #include <map>
+ #include <mutex>
+ #include <unordered_map>
diff --git a/openmw.spec b/openmw.spec
index 38c4c9d..e594112 100644
--- a/openmw.spec
+++ b/openmw.spec
@@ -1,6 +1,6 @@
Name: openmw
-Version: 0.45.0
-Release: 6%{?dist}
+Version: 0.46.0
+Release: 1%{?dist}
Summary: Unofficial open source engine re-implementation of the game Morrowind
License: GPLv3 and MIT and zlib
@@ -14,6 +14,9 @@ Patch0: %{name}.unbundle-dejavu-font.patch
# Unbundle tango icons
Patch1: %{name}.undundle-tango-icons.patch
+# Fix compilation problem in components/detournavigator/offmeshconnectionsmanager.hpp
+Patch2: openmw-foreach-offmeshconnectionsmanager.patch
+
# Openmw has problems with big indian cpu
ExcludeArch: ppc64
@@ -78,6 +81,8 @@ rm -rf files/wizard/icons/
rm -rf files/launcher/icons/
%patch1 -p1
+%patch2 -p1
+
%build
rm -rf build && mkdir build && pushd build
%cmake -DDATADIR:PATH=%{_datadir}/%{name} \
@@ -94,7 +99,7 @@ rm -rf build && mkdir build && pushd build
-DCMAKE_CXX_STANDARD=11 \
../
-make %{?_smp_mflags}
+%make_build
popd
%check
@@ -106,8 +111,8 @@ popd
pushd build
%make_install
popd
-desktop-file-validate %{buildroot}/%{_datadir}/applications/openmw-cs.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/openmw.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/org.openmw.cs.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/org.openmw.launcher.desktop
# Test and install appdata file
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
@@ -129,10 +134,11 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/data
%{_bindir}/%{name}-cs
%{_bindir}/esmtool
%{_bindir}/bsatool
+%{_bindir}/niftest
# %%{_libdir}/Plugin_MyGUI_OpenMW_Resources.so
%{_datadir}/%{name}/
-%{_datadir}/applications/%{name}-cs.desktop
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/org.openmw.cs.desktop
+%{_datadir}/applications/org.openmw.launcher.desktop
%{_datadir}/pixmaps/%{name}-cs.png
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/metainfo/%{name}.appdata.xml
@@ -140,6 +146,9 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/data
%changelog
+* Mon Jun 15 2020 Ben Rosser <rosser.bjr(a)gmail.com> - 0.46.0-1
+- Update to latest upstream release.
+
* Thu Jun 04 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.45.0-6
- Rebuilt for Boost 1.73
diff --git a/sources b/sources
index 675406c..c2e3261 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f6821aeb64b46a90a73d811846c8825 openmw-0.45.0.tar.gz
+SHA512 (openmw-0.46.0.tar.gz) = da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
4 years, 5 months
[python-vlc] Update to 3.0.10114
by Leigh Scott
commit 4f48267aa511e7a94c79cd5865fb348d93c4a245
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Jun 15 23:45:26 2020 +0100
Update to 3.0.10114
.gitignore | 1 +
python-vlc.spec | 10 +++++++---
sources | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad20fb9..6e873e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ python-vlc-1.1.0-20141115git.tar.bz2
/python-vlc-3.0.6109-20190508git949d19e.tar.bz2
/python-vlc-3.0.8112-20200311git8e6c723.tar.bz2
/python-vlc-3.0.9113.tar.gz
+/python-vlc-3.0.10114.tar.gz
diff --git a/python-vlc.spec b/python-vlc.spec
index 9461c01..1dd6512 100644
--- a/python-vlc.spec
+++ b/python-vlc.spec
@@ -4,7 +4,7 @@
%global desc This package provides a python interface to control VLC Media Player.
Name: python-%{srcname}
-Version: 3.0.9113
+Version: 3.0.10114
Release: 1%{?dist}
Summary: %{sum}
@@ -14,6 +14,7 @@ Source0: https://pypi.python.org/packages/source/p/%{pypi_name}/%{pypi_na
BuildArch: noarch
BuildRequires: python3-devel
+BuildRequires: /usr/bin/pathfix.py
BuildRequires: python3dist(setuptools)
%description
@@ -32,8 +33,8 @@ Requires: vlc-core >= 1.1.0
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
# fix shebang
-sed -i "s|! /usr/bin/env python3|! %{__python3}|" examples/glsurface.py
-sed -i "s|! /usr/bin/python|! %{__python3}|" vlc.py
+pathfix.py -pni %{__python3} examples/glsurface.py \
+ examples/play_buffer.py vlc.py
#fix rpmlint
chmod -x examples/cocoavlc.py examples/glsurface.py
# Move README.md
@@ -58,6 +59,9 @@ chmod +x %{buildroot}%{python3_sitelib}/vlc.py
%{python3_sitelib}/python_vlc-%{version}-py%{python3_version}.egg-info
%changelog
+* Mon Jun 15 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.0.10114-1
+- Update to 3.0.10114
+
* Thu Jun 11 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.0.9113-1
- Update to 3.0.9113
- Fix License
diff --git a/sources b/sources
index 82d9578..7e677a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-vlc-3.0.9113.tar.gz) = 0fef0190238695d7fb9217857c4e70b2c61be91409506e9fa175ca76af1b52d8e620126c6e8f67c8672e1bab00a9d9dd673701ff31059db7ff742881ec2f278c
+SHA512 (python-vlc-3.0.10114.tar.gz) = 95865e4dc896c5198843f5b21c7ca452bbe675c661336f44b27959519ba6fcb26e439c37d5ecb1c5c35d848c293d09d9bc7661e8f625aba5bca758a85615f6ad
4 years, 5 months
[ffmpeg] Update to 4.3 release
by Leigh Scott
commit bb12226321678678143f7f57e4d40712800f280e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Jun 15 22:36:41 2020 +0100
Update to 4.3 release
ffmpeg.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b533033..45510d1 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,7 +1,7 @@
# TODO: add make test to %%check section
#global branch oldabi-
-%global date 20200606
+#global date 20200606
#global rel rc1
# rav1e has a broken .pc file
@@ -94,7 +94,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.3
-Release: 0.23.%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -443,6 +443,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Mon Jun 15 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3-1
+- Update to 4.3 release
+
* Sat Jun 06 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3-0.23.20200606git
- Update to 20200606git
diff --git a/sources b/sources
index 5bab4bb..67a1ab1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-20200606.tar.bz2) = a463fbddea7f234b7ea888a2440fa2d013ae62551e86eb5c10382b8667f43c0c2998d969262b98df0f8c77d9808350e6eabc2e887c588336a6bd34c3e13095fb
+SHA512 (ffmpeg-4.3.tar.xz) = f031eb6c4423887af323ab7d1f431234d4e30993a52db45dccf427b41eb442a3bd020dcbc13e83cbf813fad0f36c849cb651203570148387c864507aa19f313a
4 years, 5 months
[vlc/f31: 8/8] Merge branch 'master' into f31
by Nicolas Chauvet
commit 60c88ba9231541cda9d4e51d428d4a5bc7695fb9
Merge: c89351c 62bc873
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jun 15 23:01:36 2020 +0200
Merge branch 'master' into f31
buildfix_for_old_dav1d.patch | 30 ------------------------------
sources | 2 +-
vlc.spec | 29 ++++++++++++++++-------------
3 files changed, 17 insertions(+), 44 deletions(-)
---
4 years, 5 months
[vlc/f31] (8 commits) ...Merge branch 'master' into f31
by Nicolas Chauvet
Summary of changes:
b425a2b... Fixup (*)
bf8ea03... Rebuild for dav1d SONAME bump (*)
72fe3dc... Rebuild for new x265 version (*)
abe9ec5... Remove old patch (*)
9c01685... Simplify version/rc (*)
42d2416... Add macro for dts_ver (*)
62bc873... Update to 3.0.11 (*)
60c88ba... Merge branch 'master' into f31
(*) This commit already existed in another branch; no separate mail sent
4 years, 5 months
[vlc/f32] (7 commits) ...Update to 3.0.11
by Nicolas Chauvet
Summary of changes:
b425a2b... Fixup (*)
bf8ea03... Rebuild for dav1d SONAME bump (*)
72fe3dc... Rebuild for new x265 version (*)
abe9ec5... Remove old patch (*)
9c01685... Simplify version/rc (*)
42d2416... Add macro for dts_ver (*)
62bc873... Update to 3.0.11 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 5 months
[vlc] Update to 3.0.11
by Nicolas Chauvet
commit 62bc873b3434d5a0af6001d42c63a38a134c60c7
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jun 15 22:59:10 2020 +0200
Update to 3.0.11
sources | 2 +-
vlc.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index ebdd8b6..bc903cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vlc-3.0.10.tar.xz) = dcfa39e3e61bf522ea3a0e1686251356ec262dd8826fc64ccae5ac34a62f72ddc9fe9f2e2b45588013d5907e39649cf39d0c9156980d1eb679eac9b9cb434341
+SHA512 (vlc-3.0.11.tar.xz) = 8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444
diff --git a/vlc.spec b/vlc.spec
index 2274eb0..698a6e9 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -50,8 +50,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
-Version: 3.0.10
-Release: 3%{?dist}
+Version: 3.0.11
+Release: 1%{?dist}
License: GPLv2+
URL: https://www.videolan.org
%if 0%{?commit0:1}
@@ -590,6 +590,9 @@ fi || :
%changelog
+* Mon Jun 15 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.11-1
+- Update to 3.0.11
+
* Sun May 31 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.10-3
- Rebuild for new x265 version
4 years, 5 months