[VirtualBox] Update VirtualBox to 7.1.4
by Sérgio M. Basto
commit ecc7045d41fa5ee756f2eeba025ee764398ece4f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Oct 17 20:04:57 2024 +0100
Update VirtualBox to 7.1.4
VirtualBox.spec | 7 +++++--
sources | 4 ++--
update_vbox.sh | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 2f05902..4771a5c 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -49,8 +49,8 @@
%endif
Name: VirtualBox
-Version: 7.1.2
-Release: 2%{?dist}
+Version: 7.1.4
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPL-3.0-only AND (GPL-3.0-only OR CDDL-1.0)
@@ -837,6 +837,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Thu Oct 17 2024 Sérgio Basto <sergio(a)serjux.com> - 7.1.4-1
+- Update VirtualBox to 7.1.4
+
* Fri Oct 04 2024 Sérgio Basto <sergio(a)serjux.com> - 7.1.2-2
- Not build test cases
- Minor cleanup of scripts for el7
diff --git a/sources b/sources
index f4aa81f..88538bc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-7.1.2.tar.bz2) = d890f9b2e8799bcb1ed9cdaa86ef42daa261f7e9022a2e7e9df8c21f395c56e91e2d03292f22c9633ff6a0f0c5933ba3ac30af30befe87b84ffd89c07d51568f
-SHA512 (UserManual.pdf) = 9ede8a2fcde8d11effa84e2a80166e17807d4412957045c299f3a8c51909466924d39c572e1ca2cfbbbeea40da1aad18a2dd0b0d5af1cbd6f89915792452338d
+SHA512 (VirtualBox-7.1.4.tar.bz2) = 97654339d509447e2604db01e29f9e810f59498a378e645f412cffb67022c4e547f205e8ebdac6ae33aaa8f7bc0f289bdca2e5a04b1fa31b4a05c191d7600a9c
+SHA512 (UserManual.pdf) = fd88f51bf5835b8eb0cd1e0d54b32cf4f1e14c3bdafb439ab7c60557cf2e852a04dffa5b72c8feeb15468aa0b2f9cf2de5f2d807d879e4fbe6d37bcc14396e98
diff --git a/update_vbox.sh b/update_vbox.sh
index ac5f505..b409e26 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=7.1.2
+VERSION=7.1.4
REL=1
RAWHIDE=42
REPOS="f41 f40 f39 el9"
1 month
[VirtualBox] Not build test cases
by Sérgio M. Basto
commit f3c34ca231c93293cb21ecf4675e310408d4f4c4
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Oct 17 14:29:54 2024 +0100
Not build test cases
Minor cleanup of scripts for el7
VirtualBox.spec | 74 +++++++++++++++++---------------------
cxx17.patch | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 140 insertions(+), 42 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c0300ac..2f05902 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -23,7 +23,7 @@
%bcond_with docs
%bcond_without vnc
-%if 0%{?fedora} > 27 || 0%{?rhel} >= 9
+%if 0%{?fedora} > 27 || 0%{?rhel} > 8
%bcond_with guest_additions
%else
%bcond_without guest_additions
@@ -50,7 +50,7 @@
Name: VirtualBox
Version: 7.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPL-3.0-only AND (GPL-3.0-only OR CDDL-1.0)
@@ -91,6 +91,7 @@ Patch54: VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch
# from Fedora
Patch60: VirtualBox-7.0.2-xclient-cleanups.patch
# from OpenSuse
+Patch65: cxx17.patch
# from Arch
Patch70: 009-properly-handle-i3wm.patch
@@ -177,8 +178,8 @@ BuildRequires: libvncserver-devel
%if %{with system_libtpms}
BuildRequires: pkgconfig(libtpms)
%endif
-#BuildRequires: pkgconfig(ogg)
-#BuildRequires: pkgconfig(vorbis)
+BuildRequires: pkgconfig(ogg)
+BuildRequires: pkgconfig(vorbis)
%if %{with dxvk_native}
BuildRequires: glslang
#BuildRequires: dxvk-native-devel
@@ -328,7 +329,7 @@ rm -r src/libs/libtpms-0.9.*/
#patch -P 50 -p1 -b .mageia-support
%patch -P 54 -p1 -b .dtrace
%patch -P 60 -p1 -b .xclient
-
+%patch -P 65 -p1 -b .cxx17
%patch -P 70 -p1 -b .i3wm
@@ -351,6 +352,7 @@ rm -r src/libs/libtpms-0.9.*/
cp %{SOURCE1} UserManual.pdf
%endif
+#--enable-libogg --enable-libvorbis
#--enable-vde
#--build-headless --build-libxml2
#--disable-java
@@ -375,10 +377,15 @@ kmk %{_smp_mflags} \
PATH_OUT="$PWD/obj" \
TOOL_YASM_AS=yasm \
VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
+ VBOX_PATH_APP_PRIVATE_ARCH=%{_libdir}/virtualbox \
VBOX_PATH_APP_DOCS=%{_docdir}/VirtualBox \
+ VBOX_WITH_ORIGIN= \
+ VBOX_WITH_RUNPATH=%{_libdir}/virtualbox \
+ VBOX_GUI_WITH_SHARED_LIBRARY=1 \
+ VBOX_PATH_SHARED_LIBS=%{_libdir}/virtualbox \
VBOX_WITH_VBOX_IMG=1 \
VBOX_WITH_VBOXIMGMOUNT=1 \
- VBOX_WITH_SYSFS_BY_DEFAULT=1 \
+ VBOX_WITH_UNATTENDED=1 \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_USE_SYSTEM_GL_HEADERS=1 \
VBOX_NO_LEGACY_XORG_X11=1 \
@@ -396,13 +403,20 @@ kmk %{_smp_mflags} \
%{?with_docs: VBOX_WITH_DOCS=1 } \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_WITH_UPDATE_REQUEST= \
- VBOX_WITHOUT_PRECOMPILED_HEADERS=1 \
+ VBOX_WITH_TESTCASES= \
+ VBOX_WITH_TESTSUITE= \
+ VBOX_WITH_HOST_SHIPPING_AUDIO_TEST= \
+ VBOX_WITH_VALIDATIONKIT= \
VBOX_BUILD_PUBLISHER=%{publisher}
# VBOX_WITH_CLOUD_NET:=
-# VBOX_WITH_TESTCASES= \
-# VBOX_WITH_VALIDATIONKIT= \
+# VBOX_WITH_VBOXSDL=1 \
+# VBoxSDL_INCS += \
+# VBoxSDL_LIBS
+# VBOX_WITH_SYSFS_BY_DEFAULT=1 \
+# VBOX_WITHOUT_PRECOMPILED_HEADERS=1 \
# VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+# VBOX_DOCBOOK_WITH_LATEX := 1
# build fails with system dxvk_native
@@ -507,8 +521,8 @@ ln -s VBox %{buildroot}%{_bindir}/VirtualBox
ln -s VBox %{buildroot}%{_bindir}/virtualbox
ln -s VBox %{buildroot}%{_bindir}/VBoxManage
ln -s VBox %{buildroot}%{_bindir}/vboxmanage
-ln -s VBox %{buildroot}%{_bindir}/VBoxSDL
-ln -s VBox %{buildroot}%{_bindir}/vboxsdl
+#ln -s VBox %{buildroot}%{_bindir}/VBoxSDL
+#ln -s VBox %{buildroot}%{_bindir}/vboxsdl
ln -s VBox %{buildroot}%{_bindir}/VBoxVRDP
ln -s VBox %{buildroot}%{_bindir}/VBoxHeadless
ln -s VBox %{buildroot}%{_bindir}/vboxheadless
@@ -656,35 +670,6 @@ fi
%triggerun -- VirtualBox-server < 0:6.1.10-4
/usr/bin/systemctl --no-reload preset vboxdrv.service || :
-# Need review, I don't know the rules of Icon Cache, mimeinfo and Desktop databases for epel 8
-%if 0%{?rhel} && 0%{?rhel} < 8
-%post
-# Icon Cache
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-# mimeinfo F23 only
-/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
-# Desktop databases F23 and F24 only
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- # Package upgrade, not uninstall
- # Icon Cache
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- # mimeinfo F23 only
- /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-fi
-# Desktop databases F23 and F24 only
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%posttrans
-# Icon Cache
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-# mimeinfo F23 only
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-%endif
-
%post webservice
%systemd_post vboxweb.service
@@ -752,8 +737,8 @@ getent passwd vboxadd >/dev/null || \
%{_bindir}/VBoxHeadless
%{_bindir}/VBoxManage
%{_bindir}/vboxmanage
-%{_bindir}/VBoxSDL
-%{_bindir}/vboxsdl
+#{_bindir}/VBoxSDL
+#{_bindir}/vboxsdl
%{_bindir}/VBoxVRDP
%{_bindir}/VirtualBoxVM
%{_bindir}/virtualboxvm
@@ -787,6 +772,7 @@ getent passwd vboxadd >/dev/null || \
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetNAT
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxVolInfo
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxHeadless
+#%%attr(4511,root,root) %%{_libdir}/virtualbox/VBoxSDL
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetDHCP
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl
%attr(4511,root,root) %{_libdir}/virtualbox/VirtualBoxVM
@@ -851,6 +837,10 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Fri Oct 04 2024 Sérgio Basto <sergio(a)serjux.com> - 7.1.2-2
+- Not build test cases
+- Minor cleanup of scripts for el7
+
* Fri Sep 27 2024 Sérgio Basto <sergio(a)serjux.com> - 7.1.2-1
- Update VirtualBox to 7.1.2
diff --git a/cxx17.patch b/cxx17.patch
new file mode 100644
index 0000000..640ce2e
--- /dev/null
+++ b/cxx17.patch
@@ -0,0 +1,108 @@
+From: Jan Engelhardt <ej(a)inai.de>
+Date: 2024-09-20 22:48:58.758026690 +0200
+
+The code uses <filesystem>, so ensure we always use -std=c++17 at the
+very least.
+
+Prior to C++17, noexcept cannot be part of a type alias, and so is
+not part of the function signature, and so is not part of the ABI.
+
+In C++17, noexcept is significant. There is a compile error because
+the FNCONSUMER alias as defined in a .h file does not match the
+function body in a .cpp file.
+
+The def file is also wrong, but no one at virtualbox.org noticed for
+some reason, even though the def mismatch also caused a link/build
+failure in its own right.
+
+To resolve the mismatch between .cpp/.h, the function signature is
+augmented by RT_NOEXCEPT, based upon the function head being the
+authoritative source as to whether something was meant to be noexcept
+or not.
+
+In turn, adding RT_NOEXCEPT causes a change in the ABI of VBoxRT.so.
+The closed-source VirtualBox extension pack does not expect that and
+is unable to load [LD_BIND_NOW=1]. To resolve _that_, we add extra
+symbol aliases.
+
+---
+ Config.kmk | 3 +++
+ include/iprt/cpp/restclient.h | 12 ++++++++++--
+ src/VBox/Runtime/VBox/VBoxRTImp-gcc.def | 2 +-
+ src/VBox/Runtime/common/rest/rest-binary.cpp | 9 +++++++++
+ 4 files changed, 23 insertions(+), 3 deletions(-)
+
+Index: VirtualBox-7.1.0/Config.kmk
+===================================================================
+--- VirtualBox-7.1.0.orig/Config.kmk
++++ VirtualBox-7.1.0/Config.kmk
+@@ -3093,6 +3093,9 @@ ifeq ($(KBUILD_TARGET),darwin)
+ endif
+ endif
+ endif
++ifndef VBOX_GCC_std
++ VBOX_GCC_std := -std=c++17
++endif
+
+ #
+ # Check for incompatible rpath combinations.
+Index: VirtualBox-7.1.0/include/iprt/cpp/restclient.h
+===================================================================
+--- VirtualBox-7.1.0.orig/include/iprt/cpp/restclient.h
++++ VirtualBox-7.1.0/include/iprt/cpp/restclient.h
+@@ -130,7 +130,11 @@ public:
+ * is the sum of the previously returned @a *pcbActual values.
+ */
+ typedef DECLCALLBACKTYPE(int, FNPRODUCER,(RTCRestBinaryParameter *a_pThis, void *a_pvDst, size_t a_cbDst,
+- uint64_t a_offContent, size_t *a_pcbActual)) /*RT_NOEXCEPT*/;
++ uint64_t a_offContent, size_t *a_pcbActual))
++#if defined(__cplusplus) && __cplusplus >= 201700L
++RT_NOEXCEPT
++#endif
++;
+ /** Pointer to a byte producer callback. */
+ typedef FNPRODUCER *PFNPRODUCER;
+
+@@ -268,7 +272,11 @@ public:
+ * is the sum of the previous @a a_cbSrc values.
+ */
+ typedef DECLCALLBACKTYPE(int, FNCONSUMER,(RTCRestBinaryResponse *a_pThis, const void *a_pvSrc, size_t a_cbSrc,
+- uint32_t a_uHttpStatus, uint64_t a_offContent, uint64_t a_cbContent)) /*RT_NOEXCEPT*/;
++ uint32_t a_uHttpStatus, uint64_t a_offContent, uint64_t a_cbContent))
++#if defined(__cplusplus) && __cplusplus >= 201700L
++RT_NOEXCEPT
++#endif
++;
+ /** Pointer to a byte consumer callback. */
+ typedef FNCONSUMER *PFNCONSUMER;
+
+Index: VirtualBox-7.1.0/src/VBox/Runtime/VBox/VBoxRTImp-gcc.def
+===================================================================
+--- VirtualBox-7.1.0.orig/src/VBox/Runtime/VBox/VBoxRTImp-gcc.def
++++ VirtualBox-7.1.0/src/VBox/Runtime/VBox/VBoxRTImp-gcc.def
+@@ -379,7 +379,7 @@ EXPORTS
+ _ZN22RTCRestBinaryParameter16xmitHttpCallbackEP14RTHTTPINTERNALPvmyPmS2_ ; int64=llong
+ _ZN22RTCRestBinaryParameter19setProducerCallbackEPFiPS_PvmmPmES1_m ; before-noexcept int64=long
+ _ZN22RTCRestBinaryParameter19setProducerCallbackEPFiPS_PvmyPmES1_y ; before-noexcept int64=llong
+- _ZN22RTCRestBinaryParameter19setProducerCallbackEPDoFiPS_PvmyPmES1_m ; after-noexcept int64=long
++ _ZN22RTCRestBinaryParameter19setProducerCallbackEPDoFiPS_PvmmPmES1_m ; after-noexcept int64=long
+ _ZN22RTCRestBinaryParameter19setProducerCallbackEPDoFiPS_PvmyPmES1_y ; after-noexcept int64=llong
+ _ZN22RTCRestBinaryParameterC1Ev
+ _ZN22RTCRestBinaryParameterC2Ev
+Index: VirtualBox-7.1.0/src/VBox/Runtime/common/rest/rest-binary.cpp
+===================================================================
+--- VirtualBox-7.1.0.orig/src/VBox/Runtime/common/rest/rest-binary.cpp
++++ VirtualBox-7.1.0/src/VBox/Runtime/common/rest/rest-binary.cpp
+@@ -706,3 +706,12 @@ void RTCRestBinaryResponse::receiveCompl
+ AssertRC(rc);
+ }
+
++// extpack was built with wrong -std=, add a redirect
++extern "C" void DECLEXPORT_CLASS __attribute__((weak,
++alias("_ZN21RTCRestBinaryResponse19setConsumerCallbackEPDoFiPS_PKvmjmmEPv"))) // T symbol that exists
++ _ZN21RTCRestBinaryResponse19setConsumerCallbackEPFiPS_PKvmjmmEPv( // W symbol to make
++ RTCRestBinaryResponse::PFNCONSUMER, void *);
++extern "C" void DECLEXPORT_CLASS __attribute__((weak,
++alias("_ZN22RTCRestBinaryParameter19setProducerCallbackEPDoFiPS_PvmmPmES1_m"))) // T
++ _ZN22RTCRestBinaryParameter19setProducerCallbackEPFiPS_PvmmPmES1_m( // W
++ RTCRestBinaryParameter::PFNPRODUCER, void *, uint64_t);
1 month
[telegram-desktop] Update to 5.6.3.
by Vasiliy Glazov
commit fd85061d3c1783fd983610a4f27c246986da1a1c
Author: Vasiliy Glazov <v.glazov(a)1440.space>
Date: Thu Oct 17 08:08:58 2024 +0300
Update to 5.6.3.
sources | 2 +-
telegram-desktop.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index d207b2c..50d9a15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-5.6.2-full.tar.gz) = dde4739bc18822113277c2b56f3399aae8f19ce88c9cd22d9a1470f5bb29904ece05b7dcbcdb2957286cec9f347277afdbe1421ee49d75c868cd9b12610cae42
+SHA512 (tdesktop-5.6.3-full.tar.gz) = 0cce16f780f1350199d8a10a9eff6e8052888aede5d3839d3435acdfb34f445098ec24cac21d1950f704350c22bec86020e6c746706bb34c5533e2086e6cb597
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index c7a7dec..df99d2a 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -5,7 +5,7 @@
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
Name: telegram-desktop
-Version: 5.6.2
+Version: 5.6.3
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -177,6 +177,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
+* Thu Oct 17 2024 Vasiliy Glazov <vascom2(a)gmail.com> - 5.6.3-1
+- Update to 5.6.3
+
* Tue Oct 15 2024 Vasiliy Glazov <vascom2(a)gmail.com> - 5.6.2-1
- Update to 5.6.2
1 month
[dvd95] Fix FTBFS with c99, -Werror=implicit-function-declaration
by Mamoru Tasaka
commit 62e53b2823c58ae0f09b3d97839f2b526ca208d9
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Wed Oct 16 11:57:49 2024 +0900
Fix FTBFS with c99, -Werror=implicit-function-declaration
-Werror=incompatible-pointer-types
dvd95-include-type-cat-c99.patch | 110 +++++++++++++++++++++++++++++++++++++++
dvd95.spec | 10 +++-
2 files changed, 119 insertions(+), 1 deletion(-)
---
diff --git a/dvd95-include-type-cat-c99.patch b/dvd95-include-type-cat-c99.patch
new file mode 100644
index 0000000..70e9168
--- /dev/null
+++ b/dvd95-include-type-cat-c99.patch
@@ -0,0 +1,110 @@
+Binary files dvd95-orig/dvdauthor/.libs/dvdauthor.o and dvd95-new/dvdauthor/.libs/dvdauthor.o differ
+Binary files dvd95-orig/dvdauthor/.libs/dvdvob.o and dvd95-new/dvdauthor/.libs/dvdvob.o differ
+diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdauthor.h dvd95-new/dvdauthor/dvdauthor.h
+--- dvd95-orig/dvdauthor/dvdauthor.h 2013-03-01 05:47:05.000000000 +0900
++++ dvd95-new/dvdauthor/dvdauthor.h 2024-10-15 23:58:10.917031226 +0900
+@@ -41,6 +41,8 @@ void pgc_set_color(struct pgc *p,int ind
+ void pgc_set_buttongroup(struct pgc *p,int index,unsigned char *map);
+ #endif
+ void pgc_set_stilltime(struct pgc *p,int still);
++void dvdpgc__init(void);
++void dvdvob__init(void);
+
+ enum { VIDEO_ANY=0, VIDEO_MPEG, VIDEO_FORMAT, VIDEO_ASPECT, VIDEO_RESOLUTION, VIDEO_WIDESCREEN, VIDEO_FRAMERATE, VIDEO_CAPTION };
+ enum { AUDIO_ANY=0, AUDIO_FORMAT, AUDIO_QUANT, AUDIO_DOLBY, AUDIO_LANG, AUDIO_CHANNELS, AUDIO_SAMPLERATE };
+Binary files dvd95-orig/dvdauthor/dvdauthor.o and dvd95-new/dvdauthor/dvdauthor.o differ
+diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdcli.c dvd95-new/dvdauthor/dvdcli.c
+--- dvd95-orig/dvdauthor/dvdcli.c 2013-03-01 05:47:05.000000000 +0900
++++ dvd95-new/dvdauthor/dvdcli.c 2024-10-15 23:53:59.565585994 +0900
+@@ -26,6 +26,7 @@
+
+ #include "conffile.h"
+ #include "dvdauthor.h"
++#include "libauthor.h"
+ #include "readxml.h"
+ #include "rgb.h"
+
+diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdcompile.c dvd95-new/dvdauthor/dvdcompile.c
+--- dvd95-orig/dvdauthor/dvdcompile.c 2013-03-01 05:47:05.000000000 +0900
++++ dvd95-new/dvdauthor/dvdcompile.c 2024-10-15 23:48:38.733027769 +0900
+@@ -24,6 +24,7 @@
+ #include "dvdauthor.h"
+ #include "da-internal.h"
+ #include "dvdvm.h"
++#include "libauthor.h"
+
+ static const char RCSID[]="$Id: //depot/dvdauthor/src/dvdcompile.c#15 $";
+
+diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdifo.c dvd95-new/dvdauthor/dvdifo.c
+--- dvd95-orig/dvdauthor/dvdifo.c 2013-03-01 05:47:05.000000000 +0900
++++ dvd95-new/dvdauthor/dvdifo.c 2024-10-15 23:53:30.278535034 +0900
+@@ -25,6 +25,7 @@
+
+ #include "dvdauthor.h"
+ #include "da-internal.h"
++#include "libauthor.h"
+
+ static const char RCSID[]="$Id: //depot/dvdauthor/src/dvdifo.c#19 $";
+
+diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdpgc.c dvd95-new/dvdauthor/dvdpgc.c
+--- dvd95-orig/dvdauthor/dvdpgc.c 2013-03-01 05:47:05.000000000 +0900
++++ dvd95-new/dvdauthor/dvdpgc.c 2024-10-15 23:53:43.066557287 +0900
+@@ -25,6 +25,7 @@
+
+ #include "dvdauthor.h"
+ #include "da-internal.h"
++#include "libauthor.h"
+
+ static const char RCSID[]="$Id: //depot/dvdauthor/src/dvdpgc.c#20 $";
+
+diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdvml.c dvd95-new/dvdauthor/dvdvml.c
+--- dvd95-orig/dvdauthor/dvdvml.c 2013-03-01 05:47:05.000000000 +0900
++++ dvd95-new/dvdauthor/dvdvml.c 2024-10-15 23:52:52.023468474 +0900
+@@ -79,7 +79,7 @@
+ #else
+ #define YY_PROTO(proto) ()
+ #endif
+-
++#include "libauthor.h"
+ /* Returned upon end-of-file. */
+ #define YY_NULL 0
+
+Binary files dvd95-orig/dvdauthor/dvdvob.o and dvd95-new/dvdauthor/dvdvob.o differ
+diff -urp '--exclude=*~' dvd95-orig/dvdauthor/readxml.c dvd95-new/dvdauthor/readxml.c
+--- dvd95-orig/dvdauthor/readxml.c 2013-03-01 05:47:05.000000000 +0900
++++ dvd95-new/dvdauthor/readxml.c 2024-10-15 23:58:47.576109757 +0900
+@@ -27,6 +27,7 @@
+
+ #include <libxml/xmlreader.h>
+
++#include "libauthor.h"
+ #include "readxml.h"
+
+ #ifdef HAVE_LANGINFO_CODESET
+Binary files dvd95-orig/src/dvd2vob.o and dvd95-new/src/dvd2vob.o differ
+Binary files dvd95-orig/src/dvdbackup.o and dvd95-new/src/dvdbackup.o differ
+diff -urp '--exclude=*~' dvd95-orig/src/systools.c dvd95-new/src/systools.c
+--- dvd95-orig/src/systools.c 2013-03-01 05:47:05.000000000 +0900
++++ dvd95-new/src/systools.c 2024-10-16 00:06:25.065089752 +0900
+@@ -357,8 +357,8 @@ char * mode;
+ new_argv[2] = command;
+ new_argv[3] = NULL;
+ (void) execve( SH_PATH,
+- (const char **) new_argv,
+- (const char **)environ);
++ (char * const *)new_argv,
++ (char * const *)environ);
+ /* Die if it failed. */
+ _exit(127);
+ }
+diff -urp '--exclude=*~' dvd95-orig/src/vaporize.h dvd95-new/src/vaporize.h
+--- dvd95-orig/src/vaporize.h 2013-03-01 05:47:05.000000000 +0900
++++ dvd95-new/src/vaporize.h 2024-10-16 00:00:49.435370790 +0900
+@@ -26,6 +26,7 @@ int VaporizeFactor(double factor, int dy
+ int VaporizeInjection(char *fileName);
+ int Vaporize(long long size, void *parm);
+ int VaporizeTerm(void);
++void VaporizeForgeSubs( int v );
+ void VaporizeSizes(int *pVideoPacketSize, int *pAudioPacketSize, int *pSubPacketSize, int *pNavPacketSize);
+ void VaporizePacks(int *videoPacks, int *auxPacks);
+ #ifdef __cplusplus
diff --git a/dvd95.spec b/dvd95.spec
index 9d5f9f8..c4a97ba 100644
--- a/dvd95.spec
+++ b/dvd95.spec
@@ -1,13 +1,16 @@
Summary: Graphical dvd9 to dvd5 converter
Name: dvd95
Version: 1.7p0
-Release: 18%{?dist}
+Release: 19%{?dist}
License: GPL-2.0-or-later
URL: http://dvd95.sourceforge.net/
Source: https://sourceforge.net/code-snapshots/git/d/dv/dvd95/code.git/dvd95-code...
Patch0: dvd95-1.6p0-desktop.patch
Patch1: dvd95-hardening.patch
Patch2: dvd95-format-security.patch
+# Patch for c99 confirmant, fix for
+# -Werror=implicit-function-declaration, -Werror=incompatible-pointer-types
+Patch3: dvd95-include-type-cat-c99.patch
Requires: mplayer
Requires: mencoder
@@ -45,6 +48,7 @@ DVD95 support two copy modes :
%patch -P0 -p1 -b .desktop
%patch -P1 -p1 -b .hardening
%patch -P2 -p1 -b .format-security
+%patch -P3 -p1 -b .c99
autoreconf -i
@@ -68,6 +72,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dvd95.desktop
%changelog
+* Wed Oct 16 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1.7p0-19
+- Fix FTBFS with c99, -Werror=implicit-function-declaration
+ -Werror=incompatible-pointer-types
+
* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.7p0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 month, 1 week
