[xine-lib/el8: 20/20] Merge remote-tracking branch 'origin/master' into el8
by Xavier Bachelot
commit 87ebe8b85811d3f8d12269a09c872dbe78e533dc
Merge: 35f8751 6fa6e18
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Thu Mar 10 10:12:15 2022 +0100
Merge remote-tracking branch 'origin/master' into el8
.gitignore | 3 ++
sources | 2 +-
xine-lib.spec | 95 +++++++++++++++++++++++++++++++++++++++++++++++++----------
3 files changed, 83 insertions(+), 17 deletions(-)
---
2 years, 8 months
[xine-lib/el8] (20 commits) ...Merge remote-tracking branch 'origin/master' into el8
by Xavier Bachelot
Summary of changes:
78925e6... Rebuild for dav1d SONAME bump (*)
387c6b0... Actually do the dav1d rebuild (*)
9b0d40f... Rebuilt for new ffmpeg snapshot (*)
30bc586... - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass (*)
45b6590... Rebuild for new aom (*)
e4de52e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass (*)
feeeaec... Rebuilt for new ffmpeg snapshot (*)
0e59340... Rebuilt for new ImageMagick (*)
9548943... Rebuilt for libjxl-0.6.1 (*)
07f9882... Rebuilt for new ImageMagick on F34 (*)
ed745cc... rebuilt (*)
76f31a6... Fix build with libcaca > 0.99beta20 (*)
2ada228... Update to xine-lib snapshot. (*)
16ea584... Add unpacked files (*)
6146747... Specfile clean up (*)
8796b82... Update xine-lib snapshot (*)
ca239d8... Add support for EL9 (*)
7fe47e0... Add Changelog entry and bump Release (*)
6fa6e18... Update to 1.2.12 (*)
87ebe8b... Merge remote-tracking branch 'origin/master' into el8
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[xine-lib/el9] Update to 1.2.12
by Xavier Bachelot
Summary of changes:
6fa6e18... Update to 1.2.12 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[xine-lib/f34] (9 commits) ...Update to 1.2.12
by Xavier Bachelot
Summary of changes:
ed745cc... rebuilt (*)
76f31a6... Fix build with libcaca > 0.99beta20 (*)
2ada228... Update to xine-lib snapshot. (*)
16ea584... Add unpacked files (*)
6146747... Specfile clean up (*)
8796b82... Update xine-lib snapshot (*)
ca239d8... Add support for EL9 (*)
7fe47e0... Add Changelog entry and bump Release (*)
6fa6e18... Update to 1.2.12 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[xine-lib/f35] (10 commits) ...Update to 1.2.12
by Xavier Bachelot
Summary of changes:
07f9882... Rebuilt for new ImageMagick on F34 (*)
ed745cc... rebuilt (*)
76f31a6... Fix build with libcaca > 0.99beta20 (*)
2ada228... Update to xine-lib snapshot. (*)
16ea584... Add unpacked files (*)
6146747... Specfile clean up (*)
8796b82... Update xine-lib snapshot (*)
ca239d8... Add support for EL9 (*)
7fe47e0... Add Changelog entry and bump Release (*)
6fa6e18... Update to 1.2.12 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[xine-lib/f36] (5 commits) ...Update to 1.2.12
by Xavier Bachelot
Summary of changes:
6146747... Specfile clean up (*)
8796b82... Update xine-lib snapshot (*)
ca239d8... Add support for EL9 (*)
7fe47e0... Add Changelog entry and bump Release (*)
6fa6e18... Update to 1.2.12 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[xine-lib] Update to 1.2.12
by Xavier Bachelot
commit 6fa6e183f86db56036acfa43f2bff5d61266e369
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Thu Mar 10 10:06:56 2022 +0100
Update to 1.2.12
.gitignore | 1 +
sources | 2 +-
xine-lib.spec | 15 +++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2abf637..fcfcfb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ xine-lib-1.2.6.tar.xz
/xine-lib-1.2.11.tar.xz
/xine-lib-1.2.11-20220131hg15030.tar.xz
/xine-lib-1.2.11-20220307hg15076.tar.xz
+/xine-lib-1.2.12.tar.xz
diff --git a/sources b/sources
index 2e730c9..921d38c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xine-lib-1.2.11-20220307hg15076.tar.xz) = db562b2fbf489d958b906a5fa776d49e543ef3dd0c2f886b06407daba30af48b2d162be08beccf875d4b26fff2dcb66286ff77a69449f80cf03e89ac17747050
+SHA512 (xine-lib-1.2.12.tar.xz) = cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
diff --git a/xine-lib.spec b/xine-lib.spec
index 6e94fa1..e7d3536 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,5 +1,5 @@
%define _legacy_common_support 1
-%global plugin_abi 2.9
+%global plugin_abi 2.10
%global codecdir %{_libdir}/codecs
%if 0%{?el7}
@@ -32,14 +32,14 @@
%global have_vidix 0
%endif # ix86
-%global snapshot 1
-%global date 20220307
-%global revision 15076
+#global snapshot 1
+#global date 20220307
+#global revision 15076
Summary: A multimedia engine
Name: xine-lib
-Version: 1.2.11
-Release: 14%{?snapshot:.%{date}hg%{revision}}%{?dist}
+Version: 1.2.12
+Release: 1%{?snapshot:.%{date}hg%{revision}}%{?dist}
License: GPLv2+
URL: https://www.xine-project.org/
%if ! 0%{?snapshot}
@@ -348,6 +348,9 @@ mkdir -p %{buildroot}%{codecdir}
%changelog
+* Thu Mar 10 2022 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.12-1
+- Update to 1.2.12
+
* Tue Mar 08 2022 Xavier Bachelot <xavier(a)bachelot.org> 1.2.11-14.20220307hg15076
- Specfile clean up
- Update xine-lib snapshot
2 years, 8 months
[vlc/el7: 3/3] Merge branch 'master' into el7
by Leigh Scott
commit 8d3047c24ea047eb9637d93b055224a285cad8ad
Merge: 4eeea2d 4e98573
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Mar 10 08:10:36 2022 +0000
Merge branch 'master' into el7
...-missing-include-limits-to-file-using-std.patch | 76 ----------------------
0001-Revert-configure-ignore-too-new-SRT.patch | 26 --------
recent_srt_fix.patch | 25 -------
sources | 2 +-
vlc.spec | 13 ++--
5 files changed, 9 insertions(+), 133 deletions(-)
---
2 years, 8 months
[vlc/el7] (3 commits) ...Merge branch 'master' into el7
by Leigh Scott
Summary of changes:
f633042... Fixup private headers usage (*)
4e98573... Update to 3.0.17.2 (rfbz#6241) (*)
8d3047c... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[vlc/el8: 2/2] Merge branch 'master' into el8
by Leigh Scott
commit f3fe13de7044512181766cb37cb57af498346d27
Merge: 7c79e49 4e98573
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Mar 10 08:10:17 2022 +0000
Merge branch 'master' into el8
...-missing-include-limits-to-file-using-std.patch | 76 ----------------------
0001-Revert-configure-ignore-too-new-SRT.patch | 26 --------
recent_srt_fix.patch | 25 -------
sources | 2 +-
vlc.spec | 11 ++--
5 files changed, 8 insertions(+), 132 deletions(-)
---
2 years, 8 months
