[vlc/f27] (4 commits) ...Merge branch 'master' into f27
by Leigh Scott
Summary of changes:
7360bf1... Add missing libidn (*)
923ecd2... fix without bootstrap (*)
a468d4c... Fix unexpanded ldconfig macro (rfbz#5018) (*)
f22ee01... Merge branch 'master' into f27
(*) This commit already existed in another branch; no separate mail sent
6 years
[vlc/f28: 4/4] Merge branch 'master' into f28
by Leigh Scott
commit cdc882276b72e2ed19d990923f2c7da6ffbc02cf
Merge: d3e443e a468d4c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Sep 12 07:36:41 2018 +0100
Merge branch 'master' into f28
vlc.spec | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
---
6 years
[vlc/f28] (4 commits) ...Merge branch 'master' into f28
by Leigh Scott
Summary of changes:
7360bf1... Add missing libidn (*)
923ecd2... fix without bootstrap (*)
a468d4c... Fix unexpanded ldconfig macro (rfbz#5018) (*)
cdc8822... Merge branch 'master' into f28
(*) This commit already existed in another branch; no separate mail sent
6 years
[vlc] Fix unexpanded ldconfig macro (rfbz#5018)
by Leigh Scott
commit a468d4c39c2ed156bee228209ee2dcbdeb29b18a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Sep 12 07:32:34 2018 +0100
Fix unexpanded ldconfig macro (rfbz#5018)
vlc.spec | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 67aea6f..73d74e3 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -224,6 +224,9 @@ Requires: xdg-utils
Requires: hicolor-icon-theme
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
#Merge back jack plugin into main
Obsoletes: vlc-plugin-jack < %{version}-%{release}
Provides: vlc-plugin-jack = %{version}-%{release}
@@ -259,7 +262,8 @@ VLC media player core components
%package extras
Summary: VLC media player with extras modules
Requires: vlc-core%{_isa} = %{version}-%{release}
-
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
%description extras
VLC media player extras modules.
@@ -377,7 +381,7 @@ rm -rf %{buildroot}/%{_datadir}/macosx
%ldconfig_scriptlets core
%post
-%ldconfig
+%{?ldconfig}
if [ $1 == 1 ] ; then
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null
fi || :
@@ -389,7 +393,7 @@ fi
%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
%postun
-%ldconfig
+%{?ldconfig}
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null
%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null
%{_bindir}/touch --no-create %{_datadir}/icons/hicolor
@@ -401,13 +405,13 @@ fi || :
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
%post extras
-%ldconfig
+%{?ldconfig}
if [ $1 == 1 ] ; then
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
fi
%postun extras
-%ldconfig
+%{?ldconfig}
if [ $1 == 0 ] ; then
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins &>/dev/null || :
fi
@@ -560,6 +564,9 @@ fi || :
%changelog
+* Wed Sep 12 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.4-2
+- Fix unexpanded ldconfig macro (rfbz#5018)
+
* Fri Aug 31 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.4-1
- Update to 3.0.4
6 years
[VirtualBox-kmod] Update master source, fixes kernel 4.18 >=f28 (rfbz#5017)
by Leigh Scott
commit fd770292bce0c0346ba4815e573ea4d10ab0c145
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Sep 12 06:50:24 2018 +0100
Update master source, fixes kernel 4.18 >=f28 (rfbz#5017)
VirtualBox-kmod.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 9d1c149..b456b73 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -41,7 +41,7 @@
Name: VirtualBox-kmod
Version: 5.2.18
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -140,6 +140,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed Sep 12 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 5.2.18-3
+- Update master source, fixes kernel 4.18 >=f28 (rfbz#5017)
+
* Tue Sep 04 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.18-2
- Fixes for kernel 4.18
diff --git a/sources b/sources
index c4405e8..e95182d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eaa5b072e41d89fc89eb75a8db27ffc1 master.zip
+a91d18197f3f0b46120899ec38acf4ea master.zip
6 years
[ffmpeg] Add support for libaom
by Leigh Scott
commit d898f667fc322032dad91875d9f853a949615a85
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Sep 12 06:02:36 2018 +0100
Add support for libaom
ffmpeg.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index c76d7ac..ab3695e 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -14,6 +14,7 @@
%endif
%if 0%{?rhel}
+%global _without_aom 1
%global _without_frei0r 1
%global _without_mfx 1
%global _without_opencv 1
@@ -73,7 +74,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.0.2
-Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -99,6 +100,7 @@ BuildRequires: gsm-devel
BuildRequires: lame-devel >= 3.98.3
%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
%{!?_without_ladspa:BuildRequires: ladspa-devel}
+%{!?_without_aom:BuildRequires: aom-devel}
BuildRequires: libass-devel
BuildRequires: libbluray-devel
%{?_with_bs2b:BuildRequires: libbs2b-devel}
@@ -229,6 +231,7 @@ This package contains development files for %{name}
%{?_with_gmp:--enable-gmp --enable-version3} \\\
--enable-gnutls \\\
%{!?_without_ladspa:--enable-ladspa} \\\
+ %{!?_without_aom:--enable-libaom} \\\
--enable-libass \\\
--enable-libbluray \\\
%{?_with_bs2b:--enable-libbs2b} \\\
@@ -406,6 +409,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Sep 11 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 4.0.2-5
+- Add support for libaom (rfbz#5016)
+
* Wed Sep 05 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 4.0.2-4
- Add without_opus
- Add disable opus and mfx for rhel
6 years