[dvdstyler] Update to 1:3.1-1.beta3.gite4c6466
by Martin Gansser
commit 2dd781d9e3a12c9d0090f5170ba13893c8743770
Author: Martin Gansser <mgansser(a)online.de>
Date: Mon Jan 21 18:09:33 2019 +0100
Update to 1:3.1-1.beta3.gite4c6466
.gitignore | 1 +
dvdstyler-make-desktopfile-valid.patch | 18 ------------
dvdstyler.spec | 50 ++++++++++++++++++++++++++--------
sources | 2 +-
4 files changed, 40 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a53a3de..f84d078 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ DVDStyler-2.9.6.tar.bz2
/DVDStyler-3.0.2.tar.bz2
/DVDStyler-3.0.3.tar.bz2
/DVDStyler-3.0.4.tar.bz2
+/dvdstyler-e4c6466.tar.bz2
diff --git a/dvdstyler.spec b/dvdstyler.spec
index 156cb05..d13899a 100644
--- a/dvdstyler.spec
+++ b/dvdstyler.spec
@@ -1,17 +1,37 @@
-#global prerel_real .beta3
-#global prerel b2
-%global wxsvg_ver 1.5.15
+#For git snapshots, set to 0 to use release instead:
+%global usesnapshot 1
+%if 0%{?usesnapshot}
+%global commit0 e4c6466ec3ca26af550082a97d24c001e2780239
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global snapshottag .git%{shortcommit0}
+%endif
+
+%global prerel_real .beta3
+%global prerel b2
+%global wxsvg_ver 1.5.12
Name: dvdstyler
Epoch: 1
-Version: 3.0.4
-Release: 6%{?dist}
+Version: 3.1
+Release: 1.beta3%{?snapshottag}%{?dist}
Summary: Cross-platform DVD authoring application
-
-Group: Applications/Multimedia
License: GPLv2+
URL: http://www.dvdstyler.de/
-Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}%{?prerel}...
+
+# checkout instructions
+# git clone git://git.code.sf.net/p/dvdstyler/DVDStyler dvdstyler
+# cd dvdstyler
+# git rev-parse --short HEAD
+# git archive --format=tar --prefix=dvdshortcommit0/ %%{shortcommit0} \
+# -o dvdstyler-%%{shortcommit0}.tar
+# bzip2 dvdstyler-%%{shortcommit0}.tar
+
+%if 0%{?usesnapshot}
+Source0: %{name}-%{shortcommit0}.tar.bz2
+%else
+Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%%{version}%{?prerel...
+%endif
+
Patch1: dvdstyler-wxwin.m4.patch
Patch2: ffmpeg35_buildfix.patch
# build
@@ -45,7 +65,6 @@ Requires: dvd+rw-tools
Requires: dvdauthor
Requires: mjpegtools
Requires: genisoimage
-Requires: dvdisaster
# wxsvg version with wxGTK3
Requires: wxsvg >= %{wxsvg_ver}
# note: do not add Require: totem-backend or another DVD player - see
@@ -58,11 +77,15 @@ create navigational DVD menus similar to those found on most commercial DVDs.
%prep
-%setup -q -n DVDStyler-%{version}%{?prerel}
-#patch1 -p1
-%patch2 -p1
+#%setup -q -n DVDStyler-%{version}%{?prerel}
+%setup -q -n %{name}
+%patch1 -p1
+#%patch2 -p1
#{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
+# fixes E: script-without-shebang
+chmod a-x src/*.{h,cpp}
+
%build
rm -f install-sh depcomp missing mkinstalldirs compile config.guess config.sub install-sh
rm -f aclocal.m4 Makefile.in
@@ -107,6 +130,9 @@ desktop-file-install \
%{_mandir}/*/*.gz
%changelog
+* Sun Jan 20 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 1:3.1-1.beta3.gite4c6466
+- Update to 1:3.1-1.beta3.gite4c6466
+
* Tue Dec 25 2018 Sérgio Basto <sergio(a)serjux.com> - 1:3.0.4-6
- Move to wxGTK3 as request in rfbz#5068
diff --git a/sources b/sources
index d3642f1..0825193 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5008ea1488809fb0ca877b4e617ae5a7 DVDStyler-3.0.4.tar.bz2
+bf5e9c7132a739d61840263782b0ddc5 dvdstyler-e4c6466.tar.bz2
5 years, 10 months
[shotcut/f28] Update to 19.01.19
by Martin Gansser
Summary of changes:
2ab7b8d... Update to 19.01.19 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[shotcut/f29] Update to 19.01.19
by Martin Gansser
Summary of changes:
2ab7b8d... Update to 19.01.19 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[shotcut] Update to 19.01.19
by Martin Gansser
commit 2ab7b8d04e6580b90445b058cc5854e44893b973
Author: Martin Gansser <mgansser(a)online.de>
Date: Mon Jan 21 09:57:11 2019 +0100
Update to 19.01.19
.gitignore | 1 +
shotcut.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd2cc6d..6cf1d66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/shotcut-18.10.08.tar.gz
/shotcut-18.11.18.tar.gz
/shotcut-18.12.23.tar.gz
+/shotcut-19.01.19.tar.gz
diff --git a/shotcut.spec b/shotcut.spec
index 17ef04b..2c00057 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,8 +3,9 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 18.12.23
-Release: 1%{dist}
+Version: 19.01.19
+#Release: 1%%{dist}
+Release: 0.1.beta1%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
License: GPLv3+ and LGPLv2+
@@ -183,6 +184,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.%{name}.S
%doc doc
%changelog
+* Mon Jan 21 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 19.01.19-1
+- Update to 19.01.19
+
* Wed Jan 02 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 18.12.23-1
- Update to 18.12.23
diff --git a/sources b/sources
index 7fdabd9..6229e3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fe9568ff582b28b5ea67e6eea10dcbf shotcut-18.12.23.tar.gz
+f9639ef7c0a62b4d69d9a6347d485479 shotcut-19.01.19.tar.gz
5 years, 10 months
[VirtualBox/el7] Fix build of webservice
by Sérgio M. Basto
commit b2f1f87b2619bc8658f7b66d9c0f829c01b9cf6d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jan 21 03:56:38 2019 +0000
Fix build of webservice
590355dbdcffa4081c377fd31565e172785b390c.patch | 27 ++++++++++++++++++++++++++
VirtualBox.spec | 4 ++++
2 files changed, 31 insertions(+)
---
diff --git a/590355dbdcffa4081c377fd31565e172785b390c.patch b/590355dbdcffa4081c377fd31565e172785b390c.patch
new file mode 100644
index 0000000..996ef74
--- /dev/null
+++ b/590355dbdcffa4081c377fd31565e172785b390c.patch
@@ -0,0 +1,27 @@
+From 590355dbdcffa4081c377fd31565e172785b390c Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Thu, 10 Jan 2019 19:49:43 +0000
+Subject: [PATCH] Main/webservice: fixes, bugref:9329 - the line has to be
+ somewhere.
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@76761 cfe28804-0f27-0410-a406-dd0f0b0b656f
+---
+ trunk/src/VBox/Main/webservice/vboxweb.cpp | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/trunk/src/VBox/Main/webservice/vboxweb.cpp b/trunk/src/VBox/Main/webservice/vboxweb.cpp
+index 3665922a7a..2360f67ca2 100644
+--- a/trunk/src/VBox/Main/webservice/vboxweb.cpp
++++ b/trunk/src/VBox/Main/webservice/vboxweb.cpp
+@@ -616,6 +616,11 @@ void SoapThread::process()
+ // keepalive, otherwise stale connections tie up worker threads.
+ m_soap->send_timeout = 60;
+ m_soap->recv_timeout = 60;
++ // Limit the maximum SOAP request size to a generous amount, just to
++ // be on the safe side (SOAP is quite wordy when representing arrays,
++ // and some API uses need to deal with large arrays). Good that binary
++ // data is no longer represented by byte arrays...
++ m_soap->recv_maxlength = _16M;
+ // process the request; this goes into the COM code in methodmaps.cpp
+ do {
+ #ifdef WITH_OPENSSL
diff --git a/VirtualBox.spec b/VirtualBox.spec
index eb1e49a..6b85df3 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -64,6 +64,7 @@ Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
Patch2: VirtualBox-5.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch27: VirtualBox-gcc.patch
+Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
# from Mageia
@@ -277,6 +278,9 @@ rm -r src/libs/zlib-1.2.8/
%if 0%{?fedora} > 20
%patch28 -p1 -b .gsoap2
%endif
+%if 0%{?fedora} < 28 || 0%{?rhel}
+%patch29 -p2 -R -b .gsoap3
+%endif
%patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
5 years, 10 months
[wxsvg/f29] (2 commits) ...Add BuildRequires: gcc-c++
by Martin Gansser
Summary of changes:
7f27d14... Update to 1.5.15 Move to wxGTK3 as request in rfbz#5068 (*)
d8f053d... Add BuildRequires: gcc-c++ (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[VirtualBox/el7] Update to 5.2.24.
by Sérgio M. Basto
Summary of changes:
2ea721a... Update to 5.2.24. (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[VirtualBox] Patch 61 might be useful on el7
by Sérgio M. Basto
commit abba50bc5a6fb4746cd84d41ba115f00443409cd
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jan 19 19:55:17 2019 +0000
Patch 61 might be useful on el7
...AutoMount-Change-Linux-mount-code-to-use-.patch | 131 +++++++++++++++++++++
VirtualBox.spec | 7 +-
2 files changed, 137 insertions(+), 1 deletion(-)
---
diff --git a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
new file mode 100644
index 0000000..63447ad
--- /dev/null
+++ b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
@@ -0,0 +1,131 @@
+From 369dd2ee3c82c4417fee04aeec933c74fd198e78 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede(a)redhat.com>
+Date: Tue, 23 Jan 2018 15:09:20 +0100
+Subject: [PATCH resend] VBoxServiceAutoMount: Change Linux mount code to use
+ an options string
+
+Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
+---
+ .../common/VBoxService/VBoxServiceAutoMount.cpp | 62 +++-------------------
+ 1 file changed, 8 insertions(+), 54 deletions(-)
+
+diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
+--- ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp.orig 2018-11-25 02:36:31.829306539 +0000
++++ ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-11-25 02:41:41.632973288 +0000
+@@ -40,6 +40,7 @@
+ #include <iprt/ctype.h>
+ #include <iprt/dir.h>
+ #include <iprt/mem.h>
++#include <iprt/param.h>
+ #include <iprt/path.h>
+ #include <iprt/semaphore.h>
+ #include <iprt/sort.h>
+@@ -117,6 +118,9 @@ RT_C_DECLS_END
+ # define VBOXSERVICE_AUTOMOUNT_MIQF SHFL_MIQF_PATH
+ #endif
+
++#ifndef MAX_MNTOPT_STR
++#define MAX_MNTOPT_STR PAGE_SIZE
++#endif
+
+ /*********************************************************************************************************************************
+ * Structures and Typedefs *
+@@ -398,13 +402,13 @@ static int vbsvcAutoMountSharedFolderOld
+ int rc = vbsvcAutoMountPrepareMountPointOld(pszMountPoint, pszShareName, &Opts);
+ if (RT_SUCCESS(rc))
+ {
++ char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
++ RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
++ Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask);
+ # ifdef RT_OS_SOLARIS
+ int fFlags = 0;
+ if (Opts.ronly)
+ fFlags |= MS_RDONLY;
+- char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
+- RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
+- Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask);
+ int r = mount(pszShareName,
+ pszMountPoint,
+ fFlags | MS_OPTIONSTR,
+@@ -421,34 +425,11 @@ static int vbsvcAutoMountSharedFolderOld
+
+ # else /* RT_OS_LINUX */
+ unsigned long fFlags = MS_NODEV;
+-
+- /*const char *szOptions = { "rw" }; - ??? */
+- struct vbsf_mount_info_new mntinf;
+- RT_ZERO(mntinf);
+-
+- mntinf.nullchar = '\0';
+- mntinf.signature[0] = VBSF_MOUNT_SIGNATURE_BYTE_0;
+- mntinf.signature[1] = VBSF_MOUNT_SIGNATURE_BYTE_1;
+- mntinf.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2;
+- mntinf.length = sizeof(mntinf);
+-
+- mntinf.uid = Opts.uid;
+- mntinf.gid = Opts.gid;
+- mntinf.ttl = Opts.ttl;
+- mntinf.dmode = Opts.dmode;
+- mntinf.fmode = Opts.fmode;
+- mntinf.dmask = Opts.dmask;
+- mntinf.fmask = Opts.fmask;
+- mntinf.tag[0] = '\0';
+-
+- strcpy(mntinf.name, pszShareName);
+- strcpy(mntinf.nls_name, "\0");
+-
+ int r = mount(pszShareName,
+ pszMountPoint,
+ "vboxsf",
+ fFlags,
+- &mntinf);
++ szOptBuf);
+ if (r == 0)
+ {
+ VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
+@@ -481,34 +462,6 @@ static int vbsvcAutoMountSharedFolderOld
+ }
+ else /* r == -1, we got some error in errno. */
+ {
+- if (errno == EPROTO)
+- {
+- VGSvcVerbose(3, "vbsvcAutoMountWorker: Messed up share name, re-trying ...\n");
+-
+- /** @todo r=bird: What on earth is going on here????? Why can't you
+- * strcpy(mntinf.name, pszShareName) to fix it again? */
+-
+- /* Sometimes the mount utility messes up the share name. Try to
+- * un-mangle it again. */
+- char szCWD[RTPATH_MAX];
+- size_t cchCWD;
+- if (!getcwd(szCWD, sizeof(szCWD)))
+- {
+- VGSvcError("vbsvcAutoMountWorker: Failed to get the current working directory\n");
+- szCWD[0] = '\0';
+- }
+- cchCWD = strlen(szCWD);
+- if (!strncmp(pszMountPoint, szCWD, cchCWD))
+- {
+- while (pszMountPoint[cchCWD] == '/')
+- ++cchCWD;
+- /* We checked before that we have enough space */
+- strcpy(mntinf.name, pszMountPoint + cchCWD);
+- }
+- r = mount(mntinf.name, pszMountPoint, "vboxsf", fFlags, &mntinf);
+- }
+- if (r == -1) /* Was there some error from one of the tries above? */
+- {
+ switch (errno)
+ {
+ /* If we get EINVAL here, the system already has mounted the Shared Folder to another
+@@ -527,7 +480,6 @@ static int vbsvcAutoMountSharedFolderOld
+ rc = RTErrConvertFromErrno(errno);
+ break;
+ }
+- }
+ }
+ # endif
+ }
+--
+2.14.3
+
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 5873796..9bcdb87 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -34,7 +34,7 @@
Name: VirtualBox
Version: 6.0.2
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -73,6 +73,7 @@ Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
# from Fedora
Patch60: VirtualBox-5.2.10-xclient.patch
+Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
Patch65: VirtualBox-remove-volatile-asm.patch
@@ -294,6 +295,7 @@ rm -r src/libs/zlib-1.2.8/
#patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
+%patch61 -p1 -b .automount
%patch65 -p1 -b .asm
%build
@@ -800,6 +802,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sat Jan 19 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.2-2
+- Patch 61 might be useful on el7
+
* Thu Jan 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 6.0.2-1
- Update to 6.0.2
5 years, 10 months
