commit: ba848cdfd6ef6d4e0cbdce9c6135c1e4d5339efc Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jun 12 11:17:08 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 12 11:17:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba848cdf
media-libs/libquicktime: fix uild w/ c23 Closes: https://bugs.gentoo.org/945058 Thanks-to: Bernd Feige <Bernd.Feige <AT> gmx.net> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/libquicktime-1.2.4-c23.patch | 34 ++++++ .../libquicktime/libquicktime-1.2.4-r7.ebuild | 132 +++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/media-libs/libquicktime/files/libquicktime-1.2.4-c23.patch b/media-libs/libquicktime/files/libquicktime-1.2.4-c23.patch new file mode 100644 index 000000000000..3d04f0291b8e --- /dev/null +++ b/media-libs/libquicktime/files/libquicktime-1.2.4-c23.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/945058#c10 + +Patch removing the erroneous argument from decode_audio() calls + +This patch makes it compile by removing the erroneous argument AUDIO_BLOCK_SIZE from the three invocations. +--- a/utils/lqtplay.c ++++ b/utils/lqtplay.c +@@ -1477,7 +1477,7 @@ static int qt_alsa_audio_write() + 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 @@ static int qt_sndio_audio_write(void) + 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 @@ static int qt_oss_audio_write(void) + 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) { diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r7.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r7.ebuild new file mode 100644 index 000000000000..8a95e274d61c --- /dev/null +++ b/media-libs/libquicktime/libquicktime-1.2.4-r7.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit ffmpeg-compat libtool multilib-minimal + +DESCRIPTION="An enhanced version of the quicktime4linux library" +HOMEPAGE="http://libquicktime.sourceforge.net/"; +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"; + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png static-libs vorbis X x264" + +RDEPEND=" + sys-libs/zlib + >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] + aac? ( + >=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}] + encode? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) + ) + alsa? ( >=media-libs/alsa-lib-1.0.20 ) + dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg-compat:6=[${MULTILIB_USEDEP}] ) + gtk? ( x11-libs/gtk+:2 ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) + opengl? ( virtual/opengl ) + png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] ) + vorbis? ( + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + ) + X? ( + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXext + x11-libs/libXt + x11-libs/libXv + ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + sys-devel/gettext + doc? ( app-text/doxygen ) + X? ( x11-base/xorg-proto )" + +REQUIRED_USE="opengl? ( X )" + +DOCS=( ChangeLog README TODO ) + +PATCHES=( + "${FILESDIR}"/${P}+libav-9.patch + "${FILESDIR}"/${P}-ffmpeg2.patch + "${FILESDIR}"/${P}-ffmpeg29.patch + "${FILESDIR}"/${P}-CVE-2016-2399.patch + "${FILESDIR}"/${P}-CVE-2017-9122_et_al.patch + "${FILESDIR}"/${P}-implicit-func-decl.patch + "${FILESDIR}"/${P}-faad2.patch + "${FILESDIR}"/${P}-ffmpeg-codecs.patch + "${FILESDIR}"/${P}-ffmpeg4.patch + "${FILESDIR}"/${P}-ffmpeg5.patch + "${FILESDIR}"/${P}-c23.patch +) + +src_prepare() { + default + elibtoolize # Required for .so versioning on g/fbsd +} + +multilib_src_configure() { + # utils use: alsa, opengl, gtk+, X + + # TODO: fix with >=ffmpeg-7 (or mask USE) then drop compat (bug #942966) + if use ffmpeg; then + ffmpeg_compat_setup 6 + local -x CPPFLAGS=${CPPFLAGS} LDFLAGS=${LDFLAGS} # multilib preserve + ffmpeg_compat_add_flags + fi + + ECONF_SOURCE=${S} \ + econf \ + --enable-gpl \ + $(use_enable static-libs static) \ + $(use_enable cpu_flags_x86_mmx asm) \ + $(multilib_native_use_with doc doxygen) \ + $(use vorbis || echo --without-vorbis) \ + $(use_with lame) \ + $(multilib_native_use_with X x) \ + $(multilib_native_use_with opengl) \ + $(multilib_native_use_with alsa) \ + $(multilib_native_use_with gtk) \ + $(use_with dv libdv) \ + $(use_with jpeg libjpeg) \ + $(use_with ffmpeg) \ + $(use_with png libpng) \ + --without-schroedinger \ + $(use_with aac faac) \ + $(use encode || echo --without-faac) \ + $(use_with aac faad2) \ + $(use_with x264) \ + --without-cpuflags + + if ! multilib_is_native_abi; then + # disable building utilities + sed -i -e '/SUBDIRS =/s:utils::' Makefile || die + fi +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die + + # Compatibility with software that uses quicktime prefix, but + # don't do that when building for Darwin/MacOS + [[ ${CHOST} != *-darwin* ]] && dosym /usr/include/lqt /usr/include/quicktime +} + +pkg_preinst() { + if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then + elog "For compatibility with other quicktime libraries, ${PN} was" + elog "going to create a /usr/include/quicktime symlink, but for some" + elog "reason that is a directory on your system." + + elog "Please check that is empty, and remove it, or submit a bug" + elog "telling us which package owns the directory." + die "/usr/include/quicktime is a directory." + fi +}
