[VirtualBox/f33] (3 commits) ...Update VBox to 6.1.14
by Sérgio M. Basto
Summary of changes:
100a587... Revert kernel-5.8 fixes (*)
4e16165... Revert WITH_CLOUD_NET theoretically was fixed on (*)
1d583b1... Update VBox to 6.1.14 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 1 month
[VirtualBox] Update VBox to 6.1.14
by Sérgio M. Basto
commit 1d583b117eef791176bfb8109ba6b0717d0c7946
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Sep 7 00:52:41 2020 +0100
Update VBox to 6.1.14
VirtualBox.spec | 8 ++++++--
sources | 4 ++--
update_vbox.sh | 8 ++++----
3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 061f050..835a857 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -45,8 +45,8 @@
%endif
Name: VirtualBox
-Version: 6.1.12
-Release: 4%{?dist}
+Version: 6.1.14
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -398,6 +398,7 @@ kmk %{_smp_mflags} \
%{?with_docs: VBOX_WITH_DOCS=1 } \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_WITH_UPDATE_REQUEST= \
+ VBOX_WITH_VIRTIO= \
VBOX_WITHOUT_PRECOMPILED_HEADERS=1 \
VBOX_BUILD_PUBLISHER=%{publisher}
@@ -894,6 +895,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sat Sep 05 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.14-1
+- Update VBox to 6.1.14
+
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.1.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index d6bedb4..9ed7acf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-6.1.12.tar.bz2) = 6572bb7d1db92665512e695503a6b3c9ab2850a7844818a22dcbb7d492ae4c835a68a4d06ea922341cc6584904ee3be059def2f7ca39e61d85a09b24c5120fd6
-SHA512 (UserManual.pdf) = 0a56b510ddab1b7be4eb4908427418e8ae665cc3d27d6322c4dc51d8c3b6edf9c09ed8dc29a5c5ee4b944d186dcff512966434bfcb5da54461533e493028ffc5
+SHA512 (VirtualBox-6.1.14.tar.bz2) = 4249f4f1cbaff0005c55a9ff002aa9c1573cca6e9e866cb8be4cc3a0514b0a9fc3e75ddeae8384d7c9479ed372e2d7692c4b168e15ed17bb02ff0b9418556391
+SHA512 (UserManual.pdf) = b1fb7146a8a17e4ef57e651135f43cc054fad3d28878d0e59d8196b8794296415bc54365d86c071c14b94e7c91d07487a7a69314d79119ab0670052c71e87102
diff --git a/update_vbox.sh b/update_vbox.sh
index 5e18fe0..65b907c 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
-VERSION=6.1.12
-REL=2
-RAWHIDE=33
-REPOS="f32 f31 el8 el7"
+VERSION=6.1.14
+REL=1
+RAWHIDE=34
+REPOS="f33 f32 f31 el8 el7"
if [ -z "$1" ]
then
stage=0
4 years, 1 month
[VirtualBox] Revert WITH_CLOUD_NET theoretically was fixed on
by Sérgio M. Basto
commit 4e1616515f89e5ab32b4a6aef86b185853f6a46f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Sep 5 10:42:38 2020 +0100
Revert WITH_CLOUD_NET theoretically was fixed on
VirtualBox-6.1.12a.tar.bz2
VirtualBox.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index dc28f94..061f050 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -398,7 +398,6 @@ kmk %{_smp_mflags} \
%{?with_docs: VBOX_WITH_DOCS=1 } \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_WITH_UPDATE_REQUEST= \
- VBOX_WITH_CLOUD_NET= \
VBOX_WITHOUT_PRECOMPILED_HEADERS=1 \
VBOX_BUILD_PUBLISHER=%{publisher}
4 years, 1 month
[gstreamer-plugins-bad/f33: 2/2] Merge branch 'f32' into f33
by Dominik Mierzejewski
commit 5bbb5c0db3e000df0eaea7d998fa92f729e93d5e
Merge: 83807fa 085313b
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Sun Sep 6 15:56:46 2020 +0200
Merge branch 'f32' into f33
gstreamer-plugins-bad.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --cc gstreamer-plugins-bad.spec
index b4a6081,fd2367c..79c5a0c
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@@ -30,9 -30,9 +30,11 @@@ Patch11: gst-plugins-bad-0.10.23-timidi
Patch12: 0001-vmncdec-Sanity-check-width-height-before-using-it.patch
Patch13: 0002-h264parse-Ensure-codec_data-has-the-required-size-wh.patch
Patch14: 0001-fix-faad2-version-check.patch
+# Fix build with make-4.3
+Patch15: %{name}-make43.patch
+ Provides: %{name}-free = %{version}-%{release}
+ Obsoletes: %{name}-free < 0.10.36-15
Requires: %{gstreamer} >= %{gst_minver}
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
@@@ -300,9 -302,11 +304,12 @@@ rm -r %{buildroot}%{_datadir}/gtk-do
%changelog
+ * Sun Sep 06 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 0.10.23-15
+ - add missing Provides/Obsoletes for gstreamer-plugins-bad-free{,-devel}
+
* Fri Sep 04 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 0.10.23-14
- merge with -free from Fedora
+- fix build with make 4.3
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.10.23-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 1 month
[gstreamer-plugins-bad/f31] add missing Provides/Obsoletes for gstreamer-plugins-bad-free{,-devel}
by Dominik Mierzejewski
commit 085313bb817a027291994d97354b8d9193f69391
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Sun Sep 6 15:56:33 2020 +0200
add missing Provides/Obsoletes for gstreamer-plugins-bad-free{,-devel}
gstreamer-plugins-bad.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer-plugins-bad.spec b/gstreamer-plugins-bad.spec
index c1050b8..fd2367c 100644
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@ -7,7 +7,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.23
-Release: 14%{?dist}
+Release: 15%{?dist}
# The freeze and nfs plugins are LGPLv2 (only)
License: LGPLv2+ and LGPLv2
URL: https://gstreamer.freedesktop.org/
@@ -31,6 +31,8 @@ Patch12: 0001-vmncdec-Sanity-check-width-height-before-using-it.patch
Patch13: 0002-h264parse-Ensure-codec_data-has-the-required-size-wh.patch
Patch14: 0001-fix-faad2-version-check.patch
+Provides: %{name}-free = %{version}-%{release}
+Obsoletes: %{name}-free < 0.10.36-15
Requires: %{gstreamer} >= %{gst_minver}
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
@@ -97,6 +99,8 @@ well enough, or the code is not of good enough quality.
Summary: Development files for the GStreamer media framework "bad" plug-ins
Requires: %{name} = %{version}-%{release}
Requires: gstreamer-plugins-base-devel
+Provides: %{name}-free-devel = %{version}-%{release}
+Obsoletes: %{name}-free-devel < 0.10.36-15
%description devel
GStreamer is a streaming media framework, based on graphs of elements which
@@ -298,6 +302,9 @@ rm -r %{buildroot}%{_datadir}/gtk-doc
%changelog
+* Sun Sep 06 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 0.10.23-15
+- add missing Provides/Obsoletes for gstreamer-plugins-bad-free{,-devel}
+
* Fri Sep 04 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 0.10.23-14
- merge with -free from Fedora
4 years, 1 month
[gstreamer-plugins-bad/f33: 4/4] fix build with make 4.3
by Dominik Mierzejewski
commit 83807fa1c5045e7d1a68cebb1b32cac923290ba7
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Sep 4 22:29:46 2020 +0200
fix build with make 4.3
gstreamer-plugins-bad-make43.patch | 48 ++++++++++++++++++++++++++++++++++++++
gstreamer-plugins-bad.spec | 3 +++
2 files changed, 51 insertions(+)
---
diff --git a/gstreamer-plugins-bad-make43.patch b/gstreamer-plugins-bad-make43.patch
new file mode 100644
index 0000000..6a1c347
--- /dev/null
+++ b/gstreamer-plugins-bad-make43.patch
@@ -0,0 +1,48 @@
+diff -up gst-plugins-bad-0.10.23/gst/camerabin/Makefile.in.make43 gst-plugins-bad-0.10.23/gst/camerabin/Makefile.in
+--- gst-plugins-bad-0.10.23/gst/camerabin/Makefile.in.make43 2012-02-28 20:14:08.000000000 +0100
++++ gst-plugins-bad-0.10.23/gst/camerabin/Makefile.in 2020-04-24 21:46:48.947720695 +0200
+@@ -571,7 +571,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ glib_gen_prefix = __gst_camerabin
+ glib_gen_basename = gstcamerabin
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\")
+ built_sources = gstcamerabin-marshal.c
+ built_headers = gstcamerabin-marshal.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+diff -up gst-plugins-bad-0.10.23/gst/debugutils/Makefile.in.make43 gst-plugins-bad-0.10.23/gst/debugutils/Makefile.in
+--- gst-plugins-bad-0.10.23/gst/debugutils/Makefile.in.make43 2012-02-28 20:14:09.000000000 +0100
++++ gst-plugins-bad-0.10.23/gst/debugutils/Makefile.in 2020-04-24 21:46:44.144746539 +0200
+@@ -570,7 +570,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ glib_gen_prefix = __gst_debugutils
+ glib_gen_basename = debugutils
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\")
+ built_sources = debugutils-marshal.c
+ built_headers = debugutils-marshal.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+diff -up gst-plugins-bad-0.10.23/gst-libs/gst/interfaces/Makefile.in.make43 gst-plugins-bad-0.10.23/gst-libs/gst/interfaces/Makefile.in
+--- gst-plugins-bad-0.10.23/gst-libs/gst/interfaces/Makefile.in.make43 2012-02-28 20:14:06.000000000 +0100
++++ gst-plugins-bad-0.10.23/gst-libs/gst/interfaces/Makefile.in 2020-04-24 21:46:54.678689858 +0200
+@@ -611,7 +611,7 @@ BUILT_SOURCES = \
+ $(built_headers)
+
+ CLEANFILES = $(BUILT_SOURCES)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+diff -up gst-plugins-bad-0.10.23/sys/shm/Makefile.in.make43 gst-plugins-bad-0.10.23/sys/shm/Makefile.in
+--- gst-plugins-bad-0.10.23/sys/shm/Makefile.in.make43 2012-02-28 20:14:19.000000000 +0100
++++ gst-plugins-bad-0.10.23/sys/shm/Makefile.in 2020-04-24 21:46:38.957774449 +0200
+@@ -556,7 +556,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ glib_enum_prefix = gst_shm
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\")
+ plugin_LTLIBRARIES = libgstshm.la
+ libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c
+ libgstshm_la_CFLAGS = $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB
diff --git a/gstreamer-plugins-bad.spec b/gstreamer-plugins-bad.spec
index c1050b8..b4a6081 100644
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@ -30,6 +30,8 @@ Patch11: gst-plugins-bad-0.10.23-timidity2.diff
Patch12: 0001-vmncdec-Sanity-check-width-height-before-using-it.patch
Patch13: 0002-h264parse-Ensure-codec_data-has-the-required-size-wh.patch
Patch14: 0001-fix-faad2-version-check.patch
+# Fix build with make-4.3
+Patch15: %{name}-make43.patch
Requires: %{gstreamer} >= %{gst_minver}
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
@@ -300,6 +302,7 @@ rm -r %{buildroot}%{_datadir}/gtk-doc
%changelog
* Fri Sep 04 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 0.10.23-14
- merge with -free from Fedora
+- fix build with make 4.3
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.10.23-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 1 month