Accepting request 1295245 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/1295245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libquicktime?expand=0&rev=68

fix-gcc15-build.patch

@@ -0,0 +1,39 @@
+
+sourceforge.net/p/libquicktime/git/ci/5aba9ba
+
+lqtplay.c:1518:36: warning: too many arguments in call to 'decode_audio'
+decode_audio(AUDIO_BLOCK_SIZE);
+decode_audio takes no arguments. remove the argument so the error goes away.
+
+Authored by: Steven Schultz 2021-03-04
+
+--- a/utils/lqtplay.c
++++ b/utils/lqtplay.c
+@@ -1477,7 +1477,7 @@
+     while(!done) {
+         /* Decode new audio samples */
+         if(!qt_audio_samples_in_buffer)
+-          decode_audio(AUDIO_BLOCK_SIZE);
++          decode_audio();
+         ret = snd_pcm_writei(pcm_handle, (void *)(qt_audio_ptr), qt_audio_samples_in_buffer);
+         if (ret == -EAGAIN) { 
+             ret = 0;
+@@ -1515,7 +1515,7 @@
+     int rc, n, revents;
+ 
+     if(!qt_audio_samples_in_buffer)
+-      decode_audio(AUDIO_BLOCK_SIZE);
++      decode_audio();
+ 
+     /* this code is absolutely horrible.  do not follow this example. */
+ 
+@@ -1557,7 +1557,7 @@
+     int rc;
+ 
+     if(!qt_audio_samples_in_buffer)
+-      decode_audio(AUDIO_BLOCK_SIZE);
++      decode_audio();
+     
+     rc = write(oss_fd,qt_audio_ptr,qt_audio_samples_in_buffer * qt_channels * sizeof(*qt_audio));
+     switch (rc) {
+

libquicktime.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jul 23 07:43:39 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Enable faad2 support.
+
+-------------------------------------------------------------------
+Sat May  3 14:18:03 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
+
+- add fix-gcc15-build.patch from upstream to fix gcc-15 compile
+  time error
+
 -------------------------------------------------------------------
 Mon Jan 27 15:06:58 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
 

libquicktime.spec

@@ -18,7 +18,6 @@
 
 %define sover 0
 %bcond_with    faac
-%bcond_with    faad
 %bcond_with    x264
 Name:           libquicktime
 Version:        1.2.4+git20180804.fff99cd
@@ -30,11 +29,13 @@ URL:            http://libquicktime.sf.net
 Source0:        %{name}-%{version}.tar.xz
 Source2:        baselibs.conf
 Patch0:         fix-gcc14-build.patch
+Patch1:         fix-gcc15-build.patch
 BuildRequires:  alsa-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  doxygen
 BuildRequires:  libdv-devel
+BuildRequires:  libfaad2-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmp3lame-devel
 BuildRequires:  libtool
@@ -54,9 +55,6 @@ BuildRequires:  pkgconfig(libswscale) < 6
 %if %{with faac}
 BuildRequires:  libfaac-devel
 %endif
-%if %{with faad}
-BuildRequires:  libfaad2-devel
-%endif
 %if %{with x264}
 BuildRequires:  libx264-devel
 %endif
@@ -139,6 +137,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %dir %{_libdir}/libquicktime
 %{_libdir}/libquicktime/lqt_audiocodec.so
 %{_libdir}/libquicktime/lqt_dv.so
+%{_libdir}/libquicktime/lqt_faad2.so
 %{_libdir}/libquicktime/lqt_lame.so
 %{_libdir}/libquicktime/lqt_mjpeg.so
 %{_libdir}/libquicktime/lqt_png.so
@@ -153,9 +152,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %if %{with faac}
 %{_libdir}/libquicktime/lqt_faac.so
 %endif
-%if %{with faad}
-%{_libdir}/libquicktime/lqt_faad2.so
-%endif
 %if %{with x264}
 %{_libdir}/libquicktime/lqt_x264.so
 %endif