Accepting request 1242810 from multimedia:libs

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

fix-gcc14-build.patch

@@ -10,3 +10,27 @@ Index: libquicktime-1.2.4+git20180804.fff99cd/configure.ac
      main()
      {
      int version_major;
+@@ -661,6 +662,7 @@
+ AC_TRY_RUN([
+     #include <inttypes.h>
+     #include <faac.h>
++int
+     main()
+     {
+     int samplerate = 44100, num_channels = 2;
+@@ -730,6 +732,7 @@
+ AC_TRY_RUN([
+     #include <neaacdec.h>
+     #include <stdio.h>
++int
+     main()
+     {
+     int faad_major;
+@@ -763,6 +766,7 @@
+ AC_TRY_RUN([
+     #include <faad.h>
+     #include <stdio.h>
++int
+     main()
+     {
+     int faad_major;

libquicktime.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Jan 27 15:06:58 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Move build of ffmpeg plugin to conditional BUILD_ORIG part of the
+  spec (move pkgconfig(libavcodec) and pkgconfig(libswscale)
+  BuildRequires). Avoid pulling in obsolete ffmpeg-4 during main
+  build.
+- Update to current macros.
+
+-------------------------------------------------------------------
+Sun Jan 12 18:19:42 UTC 2025 - Giacomo Comes <gcomes.obs@gmail.com>
+
+- update fix-gcc14-build.patch
+  * add fix for faad2 and faac as well
+
 -------------------------------------------------------------------
 Wed Apr 10 13:10:44 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
 

libquicktime.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libquicktime
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -42,15 +42,15 @@ BuildRequires:  libvorbis-devel
 BuildRequires:  pkgconfig
 BuildRequires:  schroedinger-devel
 BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(libavcodec) < 59
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(libswscale) < 6
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xaw7)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xv)
 %if 0%{?BUILD_ORIG}
+BuildRequires:  pkgconfig(libavcodec) < 59
+BuildRequires:  pkgconfig(libswscale) < 6
 %if %{with faac}
 BuildRequires:  libfaac-devel
 %endif
@@ -121,8 +121,9 @@ echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in
        --docdir="%{_docdir}/%{name}-devel" \
        --with-libdv \
        --with-cpuflags=none \
-       --without-gtk
-make %{?_smp_mflags}
+       --without-gtk \
+       %{nil}
+%make_build
 
 %install
 %make_install
@@ -130,8 +131,7 @@ ln -s lqt "%{buildroot}%{_includedir}/quicktime"
 %find_lang %{name} %{?no_lang_C}
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%post   -n libquicktime%{sover} -p /sbin/ldconfig
-%postun -n libquicktime%{sover} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libquicktime%{sover}
 
 %files
 %license COPYING
@@ -146,10 +146,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/libquicktime/lqt_schroedinger.so
 %{_libdir}/libquicktime/lqt_videocodec.so
 %{_libdir}/libquicktime/lqt_vorbis.so
-%{_libdir}/libquicktime/lqt_ffmpeg.so
 
 %if 0%{?BUILD_ORIG}
 %files orig-addon
+%{_libdir}/libquicktime/lqt_ffmpeg.so
 %if %{with faac}
 %{_libdir}/libquicktime/lqt_faac.so
 %endif