[VirtualBox] Add patches from virtualbox-guest-additions of Fedora proper python-VirtualBox renamed to python2-Vi
by Sérgio M. Basto
commit 2a1aef55557d008fbc77ca0a59ae02c087d8cb82
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Mar 18 11:47:47 2018 +0000
Add patches from virtualbox-guest-additions of Fedora proper
python-VirtualBox renamed to python2-VirtualBox
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
Enable vnc
...AutoMount-Change-Linux-mount-code-to-use-.patch | 130 +++++++++++++++++++++
VirtualBox-5.2.6-xclient.patch | 20 ++++
VirtualBox.spec | 65 ++++++++---
3 files changed, 196 insertions(+), 19 deletions(-)
---
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..625d554
--- /dev/null
+++ b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
@@ -0,0 +1,130 @@
+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
+index aa15d8b1..551edd4a 100644
+--- a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
++++ b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
+@@ -39,6 +39,7 @@
+ #include <iprt/assert.h>
+ #include <iprt/dir.h>
+ #include <iprt/mem.h>
++#include <iprt/param.h>
+ #include <iprt/path.h>
+ #include <iprt/string.h>
+ #include <iprt/semaphore.h>
+@@ -77,6 +78,9 @@ RT_C_DECLS_END
+ # endif
+ #endif
+
++#ifndef MAX_MNTOPT_STR
++#define MAX_MNTOPT_STR PAGE_SIZE
++#endif
+
+ /*********************************************************************************************************************************
+ * Global Variables *
+@@ -297,13 +301,13 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+ rc = vbsvcAutoMountPrepareMountPoint(pszMountPoint, pszShareName, pOpts);
+ if (!fSkip && RT_SUCCESS(rc))
+ {
+-#ifdef RT_OS_SOLARIS
+ char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
++ RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
++ pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask);
++#ifdef RT_OS_SOLARIS
+ int fFlags = 0;
+ if (pOpts->ronly)
+ fFlags |= MS_RDONLY;
+- RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
+- pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask);
+ int r = mount(pszShareName,
+ pszMountPoint,
+ fFlags | MS_OPTIONSTR,
+@@ -320,32 +324,11 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+
+ #elif defined(RT_OS_LINUX)
+ unsigned long fFlags = MS_NODEV;
+-
+- /*const char *szOptions = { "rw" }; - ??? */
+- struct vbsf_mount_info_new 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 = pOpts->uid;
+- mntinf.gid = pOpts->gid;
+- mntinf.ttl = pOpts->ttl;
+- mntinf.dmode = pOpts->dmode;
+- mntinf.fmode = pOpts->fmode;
+- mntinf.dmask = pOpts->dmask;
+- mntinf.fmask = pOpts->fmask;
+-
+- 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);
+@@ -378,34 +361,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+ }
+ 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
+@@ -424,7 +379,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+ rc = RTErrConvertFromErrno(errno);
+ break;
+ }
+- }
+ }
+ #else
+ # error "PORTME"
+--
+2.14.3
+
diff --git a/VirtualBox-5.2.6-xclient.patch b/VirtualBox-5.2.6-xclient.patch
new file mode 100644
index 0000000..75eabab
--- /dev/null
+++ b/VirtualBox-5.2.6-xclient.patch
@@ -0,0 +1,20 @@
+diff -up VirtualBox-5.2.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient~ VirtualBox-5.2.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+--- VirtualBox-5.2.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient~ 2018-01-15 15:49:57.000000000 +0100
++++ VirtualBox-5.2.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2018-02-07 12:13:51.578170786 +0100
+@@ -21,13 +21,9 @@ for i in $HOME/.vboxclient-*.pid; do
+ test -w $i || rm -f $i
+ done
+
+-if ! test -c /dev/vboxguest 2>/dev/null; then
+- # Do not start if the kernel module is not present.
+- notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting."
+-elif test -z "${SSH_CONNECTION}"; then
+- # This script can also be triggered by a connection over SSH, which is not
+- # what we had in mind, so we do not start VBoxClient in that case. We do
+- # not use "exit" here as this script is "source"d, not executed.
++# Do not start if the kernel module is not present; or if this script is
++# triggered by a connection over SSH.
++if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then
+ /usr/bin/VBoxClient --clipboard
+ /usr/bin/VBoxClient --checkhostversion
+ /usr/bin/VBoxClient --display
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 4e0a6bc..bbb7fd8 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -27,13 +27,13 @@
%else
%bcond_without docs
%endif
-%bcond_with vnc
+%bcond_without vnc
%bcond_with legacy_vboxvideo_drv
Name: VirtualBox
Version: 5.2.8
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -67,12 +67,19 @@ Patch28: 02-gsoap-build-fix.patch
Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
+Patch60: VirtualBox-5.2.6-xclient.patch
+Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
+
BuildRequires: kBuild >= 0.1.9998.r3093
-BuildRequires: SDL-devel xalan-c-devel
+BuildRequires: SDL-devel
BuildRequires: openssl-devel
BuildRequires: libcurl-devel
-BuildRequires: iasl libxslt-devel xerces-c-devel libIDL-devel
+BuildRequires: iasl
+BuildRequires: libxslt-devel
+BuildRequires: xalan-c-devel
+BuildRequires: xerces-c-devel
+BuildRequires: libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
BuildRequires: python2-devel
@@ -109,24 +116,25 @@ BuildRequires: makeself
# for 32bit on 64
%ifarch x86_64
-BuildRequires: libstdc++-static(x86-32) libgcc(x86-32)
-BuildRequires: libstdc++-static(x86-64)
BuildRequires: glibc-devel(x86-32)
+BuildRequires: libgcc(x86-32)
+BuildRequires: libstdc++-static(x86-32)
+BuildRequires: libstdc++-static(x86-64)
%else
BuildRequires: libstdc++-static
%endif
# For the X11 module
BuildRequires: libdrm-devel
+%if %{with legacy_vboxvideo_drv}
BuildRequires: libpciaccess-devel
-BuildRequires: mesa-libOSMesa-devel
BuildRequires: pixman-devel
+%endif
BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-server-devel
-BuildRequires: libXcursor-devel
BuildRequires: libXcomposite-devel
-BuildRequires: libXmu-devel
+BuildRequires: libXcursor-devel
BuildRequires: libXinerama-devel
+BuildRequires: libXmu-devel
BuildRequires: libXrandr-devel
BuildRequires: libXt-devel
BuildRequires: mesa-libEGL-devel
@@ -179,19 +187,23 @@ webservice GUI part for %{name}.
Summary: %{name} SDK
Group: Development/Libraries
Requires: %{name}-server%{?isa} = %{version}-%{release}
-Requires: python-%{name}%{?isa} = %{version}-%{release}
+Requires: python2-%{name}%{?isa} = %{version}-%{release}
%description devel
%{name} Software Development Kit.
-%package -n python-%{name}
+%package -n python2-%{name}
Summary: Python bindings for %{name}
Group: Development/Libraries
Requires: %{name}-server%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-%{srcname}}
+%{?python_provide:%python_provide python2-%{name}}
+# Remove before F30
+Provides: python-VirtualBox = %{version}-%{release}
+Provides: python-VirtualBox%{?_isa} = %{version}-%{release}
+Obsoletes: python-VirtualBox < %{version}-%{release}
-%description -n python-%{name}
+%description -n python2-%{name}
Python XPCOM bindings to %{name}.
@@ -244,7 +256,6 @@ rm -r src/VBox/Additions/x11/x11include/
rm -r src/VBox/Additions/x11/x11stubs/
rm include/VBox/HostServices/glext.h
rm include/VBox/HostServices/glxext.h
-
# wglext.h has typedefs for Windows-specific extensions
#rm include/VBox/HostServices/wglext.h
# src/VBox/GuestHost/OpenGL/include/GL/glext.h have VBOX definitions
@@ -265,6 +276,8 @@ rm -r src/libs/zlib-1.2.8/
%endif
%patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
+%patch60 -p1 -b .xclient
+%patch61 -p1 -b .automount
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -314,10 +327,9 @@ kmk %{_smp_mflags} \
%{!?legacy_vboxvideo_drv: VBOX_NO_LEGACY_XORG_X11=1 } \
SDK_VBOX_LIBPNG_INCS=/usr/include/libpng16 \
SDK_VBOX_LIBXML2_INCS=/usr/include/libxml2 \
- SDK_VBOX_OPENSSL_INCS= \
+ SDK_VBOX_OPENSSL_INCS="" \
SDK_VBOX_OPENSSL_LIBS="ssl crypto" \
SDK_VBOX_ZLIB_INCS= \
-
%if %{with docs}
VBOX_WITH_DOCS=1 \
# doc/manual/fr_FR/ missing man_VBoxManage-debugvm.xml and man_VBoxManage-extpack.xml
@@ -435,7 +447,7 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \
# SDK
pushd obj/bin/sdk/installer
VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
- python vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
+ %{__python2} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
popd
cp -rp obj/bin/sdk/. %{buildroot}%{_libdir}/virtualbox/sdk
rm -rf %{buildroot}%{_libdir}/virtualbox/sdk/installer
@@ -504,10 +516,19 @@ install -p -m 0644 -D %{SOURCE8} %{buildroot}%{_presetdir}/96-vbox.preset
install -p -m 0644 -D %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
install -p -m 0755 -D %{SOURCE9} %{buildroot}%{_bindir}/VBoxOGLRun
install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
+%if 0%{?fedora}
+#sed -i s/vboxvideo/d %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
+sed -i 's/vboxvideo/#vboxvideo/' %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
+%endif
+%if 0%{?fedora} > 27
+#sed -i s/vboxguest/d %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
+sed -i 's/vboxguest/#vboxguest/' %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
+%endif
# Module Source Code
mkdir -p %{name}-kmod-%{version}
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
+#rm -r %{name}-kmod-%{version}/vboxvideo/
install -d %{buildroot}%{_datadir}/%{name}-kmod-%{version}
tar --use-compress-program xz -cf %{buildroot}%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
%{name}-kmod-%{version}
@@ -723,7 +744,7 @@ getent passwd vboxadd >/dev/null || \
%{_libdir}/virtualbox/sdk
%exclude %{_libdir}/virtualbox/sdk/bindings/xpcom/python
-%files -n python-%{name}
+%files -n python2-%{name}
%{_libdir}/virtualbox/*.py*
%{python2_sitelib}/virtualbox
%{python2_sitelib}/vboxapi*
@@ -754,6 +775,12 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sat Mar 17 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.8-3
+- Add patches from virtualbox-guest-additions of Fedora proper
+- python-VirtualBox renamed to python2-VirtualBox
+ See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+- Enable vnc
+
* Wed Mar 07 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.8-2
- Fix minor spelling mistakes
- Remove Conflicts between subpackages server and guest-additions
6 years, 7 months
[comskip/f28] Initial import
by mprahl
Summary of changes:
2b5ffc9... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[comskip/f26] Initial import
by mprahl
Summary of changes:
2b5ffc9... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[comskip/f27] Initial import
by mprahl
Summary of changes:
2b5ffc9... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[comskip] Initial import
by mprahl
commit 2b5ffc9a4e7199a380d7a79a0c8ef5ad53e6914a
Author: mprahl <mprahl(a)redhat.com>
Date: Sat Mar 17 21:15:30 2018 -0400
Initial import
.gitignore | 1 +
...-AM_PROG_CC_C_O-for-missing-legacy-source.patch | 24 ++++++++++
0002-replace-deprecated-CODEC_FLAG_GRAY.patch | 52 ++++++++++++++++++++++
...o-be-explicitly-enabled-or-disabled-with-.patch | 52 ++++++++++++++++++++++
comskip.spec | 46 +++++++++++++++++++
sources | 1 +
6 files changed, 176 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..ad60981 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/v0.82.003.tar.gz
diff --git a/0001-Added-AM_PROG_CC_C_O-for-missing-legacy-source.patch b/0001-Added-AM_PROG_CC_C_O-for-missing-legacy-source.patch
new file mode 100644
index 0000000..d16d367
--- /dev/null
+++ b/0001-Added-AM_PROG_CC_C_O-for-missing-legacy-source.patch
@@ -0,0 +1,24 @@
+From 709c98160dd036369d1cabeba575103939810368 Mon Sep 17 00:00:00 2001
+From: Adrian Gilbert <adrian(a)gilbert.ca>
+Date: Thu, 9 Nov 2017 21:05:59 -0500
+Subject: [PATCH 01/10] Added AM_PROG_CC_C_O for missing legacy source
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0d02a9f..b0eca1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,6 +51,7 @@ PKG_CHECK_MODULES(sdl, [sdl >= 1.2.0], has_sdl=yes, has_sdl=no)
+ AC_MSG_CHECKING([whether to build the graphical user interface])
+ AC_MSG_RESULT([$has_sdl])
+ AM_CONDITIONAL([BUILD_GUI], [test "x${has_sdl}" = "xyes"])
++AM_PROG_CC_C_O
+
+ AC_CONFIG_FILES(Makefile)
+ AC_OUTPUT
+--
+2.14.3
+
diff --git a/0002-replace-deprecated-CODEC_FLAG_GRAY.patch b/0002-replace-deprecated-CODEC_FLAG_GRAY.patch
new file mode 100644
index 0000000..13e79f5
--- /dev/null
+++ b/0002-replace-deprecated-CODEC_FLAG_GRAY.patch
@@ -0,0 +1,52 @@
+From 1d987bde60b09db7dfbc1f0bf3f2096a370a4844 Mon Sep 17 00:00:00 2001
+From: Aman Gupta <aman(a)tmm1.net>
+Date: Sat, 2 Dec 2017 14:24:08 -0800
+Subject: [PATCH 03/10] replace deprecated CODEC_FLAG_GRAY
+
+---
+ mpeg2dec.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mpeg2dec.c b/mpeg2dec.c
+index c0ab945..27f0f6e 100755
+--- a/mpeg2dec.c
++++ b/mpeg2dec.c
+@@ -1199,7 +1199,7 @@ static int prev_strange_framenum = 0;
+ real_pts = 0.0;
+ pts = 0;
+ //is->video_st->codec.thread_type
+- if (!hardware_decode) is->video_st->codec->flags |= CODEC_FLAG_GRAY;
++ if (!hardware_decode) is->video_st->codec->flags |= AV_CODEC_FLAG_GRAY;
+ // Decode video frame
+ len1 = avcodec_decode_video2(is->video_st->codec, is->pFrame, &frameFinished,
+ packet);
+@@ -1608,7 +1608,7 @@ int stream_component_open(VideoState *is, int stream_index)
+
+ if (codecCtx->codec_type == AVMEDIA_TYPE_VIDEO)
+ {
+- if (!hardware_decode) codecCtx->flags |= CODEC_FLAG_GRAY;
++ if (!hardware_decode) codecCtx->flags |= AV_CODEC_FLAG_GRAY;
+ is->dec_ctx = codecCtx;
+ #ifdef HARDWARE_DECODE
+ ist->dec_ctx = codecCtx;
+@@ -1732,7 +1732,7 @@ int stream_component_open(VideoState *is, int stream_index)
+ // is->video_current_pts_time = av_gettime();
+
+ is->pFrame = av_frame_alloc();
+- if (!hardware_decode) codecCtx->flags |= CODEC_FLAG_GRAY;
++ if (!hardware_decode) codecCtx->flags |= AV_CODEC_FLAG_GRAY;
+ // codecCtx->thread_type = 1; // Frame based threading
+ codecCtx->lowres = min(av_codec_get_max_lowres(codecCtx->codec),lowres);
+ if (codecCtx->codec_id == AV_CODEC_ID_H264)
+@@ -1848,7 +1848,7 @@ void file_open()
+
+ // av_dict_set_int(&opts, "lowres", stream_lowres, 0);
+ if (!hardware_decode) {
+-// codecCtx->flags |= CODEC_FLAG_GRAY;
++// codecCtx->flags |= AV_CODEC_FLAG_GRAY;
+ av_dict_set_int(&myoptions, "gray", 1, 0);
+ }
+ #ifdef DONATOR
+--
+2.14.3
+
diff --git a/0003-Allow-GUI-to-be-explicitly-enabled-or-disabled-with-.patch b/0003-Allow-GUI-to-be-explicitly-enabled-or-disabled-with-.patch
new file mode 100644
index 0000000..d305ffd
--- /dev/null
+++ b/0003-Allow-GUI-to-be-explicitly-enabled-or-disabled-with-.patch
@@ -0,0 +1,52 @@
+From 93fe4fc92050214dcd43ae12613f8d41f8e7d178 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi(a)gentoo.org>
+Date: Wed, 27 Dec 2017 11:31:58 +0000
+Subject: [PATCH 05/10] Allow GUI to be explicitly enabled or disabled with
+ configure
+
+Linux distributions hate automagic dependencies. :)
+---
+ configure.ac | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b0eca1e..d57dcae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,6 +30,10 @@ AC_MSG_CHECKING([whether to enable donator features])
+ AS_IF([test "x${enable_donator}" = "xno"], AC_MSG_RESULT([no]), AC_MSG_RESULT([yes]))
+ AM_CONDITIONAL([ENABLE_DONATOR], [test "x${enable_donator}" != "xno"])
+
++AC_ARG_ENABLE([gui], AS_HELP_STRING([--disable-gui], [build without the graphical user interface]))
++AC_MSG_CHECKING([whether to enable the graphical user interface])
++AS_CASE([x${enable_gui}], [xno], [AC_MSG_RESULT([no])], [x?*], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([if possible])])
++
+ AC_ARG_ENABLE([static], [AS_HELP_STRING([--enable-static], [build a statically linked binary])])
+ AC_MSG_CHECKING([whether to build a statically linked binary])
+ AS_IF([test "x${enable_static}" = "xyes"], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no]))
+@@ -47,9 +51,19 @@ AS_IF([test "x${enable_static}" = "xyes"], PKG_CONFIG="$PKG_CONFIG --static")
+ PKG_CHECK_MODULES(argtable2, [argtable2 >= 2.12])
+ PKG_CHECK_MODULES(ffmpeg, [libavutil >= 54.7 libavformat >= 56.4 libavcodec >= 56.1])
+
+-PKG_CHECK_MODULES(sdl, [sdl >= 1.2.0], has_sdl=yes, has_sdl=no)
+-AC_MSG_CHECKING([whether to build the graphical user interface])
+-AC_MSG_RESULT([$has_sdl])
++AS_IF([test "x${enable_gui}" = "xno"], [
++ has_sdl=no
++], [
++ AS_IF([test "x${enable_gui}" != "x"], [
++ PKG_CHECK_MODULES(sdl, [sdl >= 1.2.0], has_sdl=yes)
++ ], [
++ PKG_CHECK_MODULES(sdl, [sdl >= 1.2.0], has_sdl=yes, has_sdl=no)
++ ])
++
++ AC_MSG_CHECKING([whether we can build the graphical user interface])
++ AC_MSG_RESULT([$has_sdl])
++])
++
+ AM_CONDITIONAL([BUILD_GUI], [test "x${has_sdl}" = "xyes"])
+ AM_PROG_CC_C_O
+
+--
+2.14.3
+
diff --git a/comskip.spec b/comskip.spec
new file mode 100644
index 0000000..216bbe0
--- /dev/null
+++ b/comskip.spec
@@ -0,0 +1,46 @@
+Name: comskip
+Version: 0.82.003
+Release: 3%{?dist}
+Summary: A free commercial detector
+License: GPLv2+
+URL: https://github.com/erikkaashoek/Comskip
+Source0: %{url}/archive/v%{version}.tar.gz
+Patch0: 0001-Added-AM_PROG_CC_C_O-for-missing-legacy-source.patch
+Patch1: 0002-replace-deprecated-CODEC_FLAG_GRAY.patch
+Patch2: 0003-Allow-GUI-to-be-explicitly-enabled-or-disabled-with-.patch
+
+BuildRequires: libtool
+BuildRequires: argtable-devel
+BuildRequires: ffmpeg-devel
+
+%description
+Comskip is a free commercial detector written by erikkaashoek
+
+%prep
+%autosetup -p1 -n Comskip-%{version}
+
+%build
+# The version wasn't updated in the configure.ac file
+sed -i "s/0.81.098/%{version}/" configure.ac
+./autogen.sh
+%configure --disable-gui
+%make_build
+
+%install
+%make_install
+
+%files
+%license LICENSE
+%{_bindir}/comskip
+
+%changelog
+* Sat Mar 17 2018 mprahl <mprahl(a)redhat.com> - 0.82.003-3
+- Explicitly disable the GUI
+- Fix compilation errors with newer ffmpeg versions
+
+* Sat Jan 27 2018 mprahl <mprahl(a)redhat.com> - 0.82.003-2
+- Removed unneeded dependencies
+
+* Tue Dec 12 2017 Matt Prahl <mprahl(a)redhat.com> - 0.82.003-1
+- Initial release
+
diff --git a/sources b/sources
index e69de29..c360e7d 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+09fce09b31ae83228f1a91e9f2855a51 v0.82.003.tar.gz
6 years, 7 months
[vlc] Rebuilt
by Nicolas Chauvet
commit 156b471bb9694e7b0081ef98aa4e61a1b10a7b96
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Mar 17 16:16:00 2018 +0100
Rebuilt
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 1c878b1..b6116a5 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -43,7 +43,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: %{vlc_vers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{vlc_vers}/}vlc-%{vlc_vers}%{?vlc_tag}.tar.xz
@@ -554,6 +554,9 @@ fi || :
%changelog
+* Sat Mar 17 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-4
+- Rebuilt for live555
+
* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 3.0.1-3
- Rebuilt for new ffmpeg snapshot
- Patch for fribidi version 1.0
6 years, 7 months
