The package rpms/libquicktime.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/libquicktime.git/commit/?id=51d506ea... https://src.fedoraproject.org/cgit/rpms/libquicktime.git/commit/?id=4b2dbe9e... https://src.fedoraproject.org/cgit/rpms/libquicktime.git/commit/?id=998b08b2... https://src.fedoraproject.org/cgit/rpms/libquicktime.git/commit/?id=9b28b9ad... https://src.fedoraproject.org/cgit/rpms/libquicktime.git/commit/?id=433eb265....
Change: +%ifnarch s390x -%ifarch i686 pentium3 pentium4 athlon x86_64 ia64 +%ifarch i686 pentium3 pentium4 athlon x86_64 ia64 +%ifarch %{ix86} x86_64 ia64 +%ifarch i686 athlon pentium3 pentium4 x86_64 ia64
Thanks.
Full change: ============
commit 4f0f87f98e0c693ccaef50b88d4377eebf120fb7 Author: Dominik 'Rathann' Mierzejewski dominik@greysector.net Date: Sat Jun 7 22:28:55 2025 +0200
drop obsolete scripts
diff --git a/converttogit.sh b/converttogit.sh deleted file mode 100644 index a361eba..0000000 --- a/converttogit.sh +++ /dev/null @@ -1,23 +0,0 @@ - - -cvs -d:pserver:anonymous@libquicktime.cvs.sourceforge.net:/cvsroot/libquicktime login -cvs -z3 -d:pserver:anonymous@libquicktime.cvs.sourceforge.net:/cvsroot/libquicktime co -P libquicktime -cd libquicktime -git cvsimport -v - -In github.com press + and new repository, choose repository name: libquicktime -without "Initialize this repository with a README" . -and run: - -git remote add origin git@github.com:sergiomb2/libquicktime.git -git push -u origin master - -and I got this : -https://github.com/sergiomb2/libquicktime/commits/master - -and with: -git remote set-url origin ssh://sergiomb@git.code.sf.net/p/libquicktime/git -git push -u origin master - -and we got : -https://sourceforge.net/p/libquicktime/git/ci/master/tree/ diff --git a/update_libquicktime.sh b/update_libquicktime.sh deleted file mode 100755 index eaf4716..0000000 --- a/update_libquicktime.sh +++ /dev/null @@ -1,31 +0,0 @@ -git clone https://sergiomb@git.code.sf.net/p/libquicktime/git libquicktime -version=1.2.4 -tag=$version -branch=master -pushd libquicktime -git checkout $branch -git pull -#git log $tag..HEAD > ../ChangeLog -newdescrib=$(git describe --tags) -date=$(git log -1 --format=%cd --date=short | tr -d -) -relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/.g/.${date}git/") -githash=$(git rev-parse HEAD) -shorthash=$(echo $githash | cut -b -10) -popd -#git checkout libquicktime.spec -#sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" libquicktime.spec -sed -i "s|^%define rel_string .*|%define rel_string $relversion|" libquicktime.spec -sed -i "s|^%define githash .*|%define githash $githash|" libquicktime.spec -rpmdev-bumpspec -c "Update to $version$relversion from branch $branch" libquicktime.spec -spectool -g libquicktime.spec -echo Press enter to run: rfpkg new-sources libquicktime-${version}-${githash}.zip; read dummy; -rfpkg new-sources libquicktime-git-${githash}.zip -rfpkg ci -c && git show -echo Press enter to continue; read dummy; -rfpkg push && rfpkg build --nowait -echo Press enter to continue; read dummy; -git checkout f29 && git merge master && git push && rfpkg build --nowait; git checkout master -echo Press enter to continue; read dummy; -git checkout f28 && git merge master && git push && rfpkg build --nowait; git checkout master -echo Press enter to continue; read dummy; -git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
commit 5c555ffdb76a03edf114fc9b0a257913a5d5d9b5 Author: Dominik 'Rathann' Mierzejewski dominik@greysector.net Date: Sat Jun 7 21:27:45 2025 +0200
fix build on epel10
diff --git a/libquicktime.spec b/libquicktime.spec index 245a8f4..3561021 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -2,11 +2,18 @@ %global commit 2213b76712c8e08d885482d117f904d570c990aa %global shortcommit %(c=%{commit}; echo ${c:0:7})
+%if 0%{?rhel} && 0%{?rhel} > 9 +%bcond schroedinger 0 +%bcond libdv 0 +%else +%bcond schroedinger 1 +%bcond libdv 1 +%endif
Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 61.%{date}git%{shortcommit}%{?dist} +Release: 62.%{date}git%{shortcommit}%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -15,7 +22,6 @@ Patch0: %{name}-modern-c.patch BuildRequires: alsa-lib-devel BuildRequires: autoconf BuildRequires: automake -%{?el7:BuildRequires: epel-rpm-macros} BuildRequires: gcc BuildRequires: gettext-devel BuildRequires: gtk2-devel @@ -24,7 +30,7 @@ BuildRequires: lame-devel BuildRequires: libavc1394-devel BuildRequires: libraw1394-devel %endif -BuildRequires: libdv-devel +%{?with_libdv:BuildRequires: libdv-devel} BuildRequires: libGLU-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -33,7 +39,7 @@ BuildRequires: libvorbis-devel BuildRequires: libXaw-devel BuildRequires: libXt-devel BuildRequires: libXv-devel -BuildRequires: schroedinger-devel +%{?with_schroedinger:BuildRequires: schroedinger-devel}
%package utils Summary: Utilities for working with Quicktime files @@ -75,7 +81,7 @@ enhancements. This package contains development files for %{name}. --disable-static \ --enable-gpl \ --with-cpuflags="$RPM_OPT_FLAGS" \ - --with-libdv \ + %{?with_libdv:--with-libdv} \ --without-doxygen \
# remove rpath from libtool @@ -95,12 +101,12 @@ rm -v %{buildroot}%{_libdir}/%{name}{,/lqt_*}.la %{_libdir}/%{name}.so.0{,.*} %dir %{_libdir}/%{name} %{_libdir}/%{name}/lqt_audiocodec.so -%{_libdir}/%{name}/lqt_dv.so +%{?with_libdv:%{_libdir}/%{name}/lqt_dv.so} %{_libdir}/%{name}/lqt_lame.so %{_libdir}/%{name}/lqt_mjpeg.so %{_libdir}/%{name}/lqt_png.so %{_libdir}/%{name}/lqt_rtjpeg.so -%{_libdir}/%{name}/lqt_schroedinger.so +%{?with_schroedinger:%{_libdir}/%{name}/lqt_schroedinger.so} %{_libdir}/%{name}/lqt_videocodec.so %{_libdir}/%{name}/lqt_vorbis.so
@@ -124,6 +130,9 @@ rm -v %{buildroot}%{_libdir}/%{name}{,/lqt_*}.la %{_libdir}/%{name}.so
%changelog +* Sat Jun 07 2025 Dominik Mierzejewski dominik@greysector.net - 1.2.4-62.20240202git2213b76 +- fix build on epel10 + * Fri Mar 01 2024 Dominik Mierzejewski dominik@greysector.net - 1.2.4-61.20240202git2213b76 - drop missing lib{avc,raw}1394 build dependencies on s390x - add LGPLv2.1 to License field
commit 51d506eaf7af22d5975da4bc61b86ea35f9c2b3d Author: Dominik 'Rathann' Mierzejewski dominik@greysector.net Date: Sat Jun 7 15:44:21 2025 +0200
initial import to Fedora
- drop missing lib{avc,raw}1394 build dependencies on s390x - add LGPLv2.1 to License field - own _libdir/libquicktime - use global instead of define - fix LAME detection - update to 1.2.4 from branch master - build without faad, ffmpeg4 and x264 - drop RHEL4-era versions in BRs - sort BRs alphabetically and de-duplicate - SPDX license identifier - use Fedora versioning guidelines and macro names - use more explicit file list - resolves rhbz#2267127
diff --git a/.gitignore b/.gitignore index 73c834b..d436ad2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libquicktime-1.2.4.tar.gz /libquicktime-git-fff99cdd4126f379ae538c4d3b09265242512384.zip /libquicktime-git-4e11b756462d21c941e2a2d636c234b4ab177552.zip /libquicktime-git-27295919b3a1036ba8bc06cec414dcc501f72d89.zip +/libquicktime-git-2213b76712c8e08d885482d117f904d570c990aa.zip diff --git a/libquicktime-modern-c.patch b/libquicktime-modern-c.patch new file mode 100644 index 0000000..050bde5 --- /dev/null +++ b/libquicktime-modern-c.patch @@ -0,0 +1,12 @@ +diff -up libquicktime-git-2213b76712c8e08d885482d117f904d570c990aa/configure.ac.orig libquicktime-git-2213b76712c8e08d885482d117f904d570c990aa/configure.ac +--- libquicktime-git-2213b76712c8e08d885482d117f904d570c990aa/configure.ac.orig 2024-02-03 02:55:35.000000000 +0100 ++++ libquicktime-git-2213b76712c8e08d885482d117f904d570c990aa/configure.ac 2024-03-01 09:04:39.171159808 +0100 +@@ -235,7 +235,7 @@ have_lame="false" + AC_TRY_RUN([ + #include <lame/lame.h> + #include <stdio.h> +- main() ++ int main() + { + int version_major; + int version_minor; diff --git a/libquicktime.spec b/libquicktime.spec index 23bc943..245a8f4 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,54 +1,49 @@ -%define vers_string 1.2.4-98-g859a717 -%define rel_string .124.20210720git2729591 -%define githash 27295919b3a1036ba8bc06cec414dcc501f72d89 -%define shorthash %(c=%{githash}; echo ${c:0:10}) +%global date 20240202 +%global commit 2213b76712c8e08d885482d117f904d570c990aa +%global shortcommit %(c=%{commit}; echo ${c:0:7})
Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 58%{?rel_string}%{?dist} -License: LGPLv2+ +Release: 61.%{date}git%{shortcommit}%{?dist} +License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: http://libquicktime.sourceforge.net/ -Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... +Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... +Patch0: %{name}-modern-c.patch
-BuildRequires: gcc +BuildRequires: alsa-lib-devel +BuildRequires: autoconf +BuildRequires: automake %{?el7:BuildRequires: epel-rpm-macros} +BuildRequires: gcc +BuildRequires: gettext-devel +BuildRequires: gtk2-devel +BuildRequires: lame-devel +%ifnarch s390x +BuildRequires: libavc1394-devel +BuildRequires: libraw1394-devel +%endif BuildRequires: libdv-devel -BuildRequires: libpng-devel -BuildRequires: libjpeg-devel BuildRequires: libGLU-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtool BuildRequires: libvorbis-devel -BuildRequires: ffmpeg-devel -BuildRequires: schroedinger-devel -BuildRequires: lame-devel -BuildRequires: alsa-lib-devel -BuildRequires: libXt-devel BuildRequires: libXaw-devel +BuildRequires: libXt-devel BuildRequires: libXv-devel -BuildRequires: libdv-devel >= 0.102-4 -BuildRequires: x264-devel -BuildRequires: faad2-devel -BuildRequires: libavc1394-devel -BuildRequires: libraw1394-devel >= 0.9.0-12 -BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: schroedinger-devel -BuildRequires: gettext-devel -%{?_with_faac:BuildRequires: faac-devel} - -# Packages for re-configuration -BuildRequires: autoconf automake libtool
%package utils Summary: Utilities for working with Quicktime files +Requires: %{name}%{?_isa} = %{version}-%{release}
%package devel Summary: Development files for libquicktime Requires: %{name}%{?_isa} = %{version}-%{release} Requires: zlib-devel
-# -------------------------------------------------------------------- - %description Libquicktime is based on the quicktime4linux library with several enhancements. All 3rd-party libraries were removed from the @@ -58,7 +53,7 @@ dynamically loadable modules, and new codecs are in development. Libquicktime is source-compatible with quicktime4linux. Special API extensions allow access to the codec registry and more convenient processing of Audio and Video -data. +data.
%description utils Libquicktime is based on the quicktime4linux library with several @@ -70,24 +65,18 @@ can configure the parameters of all installed codecs. Libquicktime is based on the quicktime4linux library with several enhancements. This package contains development files for %{name}.
-# -------------------------------------------------------------------- - %prep -%autosetup -n %{name}-git-%{githash} - -# -------------------------------------------------------------------- +%autosetup -n %{name}-git-%{commit}
%build ./autogen.sh %configure \ - --enable-gpl \ --disable-rpath \ - --with-cpuflags="$RPM_OPT_FLAGS" \ - --disable-dependency-tracking \ - --without-doxygen \ --disable-static \ + --enable-gpl \ + --with-cpuflags="$RPM_OPT_FLAGS" \ --with-libdv \ - --enable-libswscale + --without-doxygen \
# remove rpath from libtool sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -95,25 +84,25 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_build
-# -------------------------------------------------------------------- - %install %make_install -find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; - - +rm -v %{buildroot}%{_libdir}/%{name}{,/lqt_*}.la %find_lang %{name}
- -# -------------------------------------------------------------------- - -%ldconfig_scriptlets - %files -f %{name}.lang %license COPYING %doc README TODO -%{_libdir}/%{name}*.so.* -%{_libdir}/%{name}/ +%{_libdir}/%{name}.so.0{,.*} +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/lqt_audiocodec.so +%{_libdir}/%{name}/lqt_dv.so +%{_libdir}/%{name}/lqt_lame.so +%{_libdir}/%{name}/lqt_mjpeg.so +%{_libdir}/%{name}/lqt_png.so +%{_libdir}/%{name}/lqt_rtjpeg.so +%{_libdir}/%{name}/lqt_schroedinger.so +%{_libdir}/%{name}/lqt_videocodec.so +%{_libdir}/%{name}/lqt_vorbis.so
%files utils %{_bindir}/libquicktime_config @@ -132,11 +121,27 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; %files devel %{_includedir}/lqt/ %{_libdir}/pkgconfig/libquicktime.pc -%{_libdir}/%{name}*.so - -# -------------------------------------------------------------------- +%{_libdir}/%{name}.so
%changelog +* Fri Mar 01 2024 Dominik Mierzejewski dominik@greysector.net - 1.2.4-61.20240202git2213b76 +- drop missing lib{avc,raw}1394 build dependencies on s390x +- add LGPLv2.1 to License field +- own _libdir/libquicktime +- use global instead of define + +* Fri Mar 01 2024 Dominik Mierzejewski dominik@greysector.net - 1.2.4-60.20240202git2213b76 +- fix LAME detection + +* Wed Feb 28 2024 Dominik Mierzejewski dominik@greysector.net - 1.2.4-59.20240202git2213b76 +- update to 1.2.4 from branch master +- build without faad, ffmpeg4 and x264 +- drop RHEL4-era versions in BRs +- sort BRs alphabetically and de-duplicate +- SPDX license identifier +- use Fedora versioning guidelines and macro names +- use more explicit file list + * Wed Nov 08 2023 Leigh Scott leigh123linux@gmail.com - 1.2.4-58.124.20210720git2729591 - Rebuild for new faad2 version
diff --git a/sources b/sources index 54d0031..cda40da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libquicktime-git-27295919b3a1036ba8bc06cec414dcc501f72d89.zip) = 67c45fa98c3d7a11dda8ea2cd203c7068f7855dd9da07f2409730edd52fe95fe48367f90f9b2b52de161445f089484345347210fc1e447349ad9e227d61f06c3 +SHA512 (libquicktime-git-2213b76712c8e08d885482d117f904d570c990aa.zip) = 9e6d22fdcbb5501cee89cc82e71a59e6c3aaac1ce9f0d3737ba0accd9b4735aadd70cf6d45bf9fb4bf64fb29b9c85e9df6879b98980d56094cc9e449f12f3a03
commit 988a64009efd794b3418074044e43e0638231979 Author: Leigh Scott leigh123linux@gmail.com Date: Wed Nov 8 00:55:08 2023 +0000
Rebuild for new faad2 version
diff --git a/libquicktime.spec b/libquicktime.spec index 59b37d4..23bc943 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 57%{?rel_string}%{?dist} +Release: 58%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Wed Nov 08 2023 Leigh Scott leigh123linux@gmail.com - 1.2.4-58.124.20210720git2729591 +- Rebuild for new faad2 version + * Wed Aug 02 2023 RPM Fusion Release Engineering sergiomb@rpmfusion.org - 1.2.4-57.124.20210720git2729591 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
commit 22a00b18835a782d7c686c23f622da53ee882e3c Author: Sérgio M. Basto sergio@serjux.com Date: Wed Aug 2 13:30:12 2023 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Sérgio M. Basto sergio@serjux.com
diff --git a/libquicktime.spec b/libquicktime.spec index 6a280cb..59b37d4 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 56%{?rel_string}%{?dist} +Release: 57%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Wed Aug 02 2023 RPM Fusion Release Engineering sergiomb@rpmfusion.org - 1.2.4-57.124.20210720git2729591 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Aug 07 2022 RPM Fusion Release Engineering sergiomb@rpmfusion.org - 1.2.4-56.124.20210720git2729591 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1
commit 7070af20ddfc90033b838c5fbf6c3a2c1e18f261 Author: Sérgio M. Basto sergio@serjux.com Date: Sun Aug 7 16:22:30 2022 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1
Signed-off-by: Sérgio M. Basto sergio@serjux.com
diff --git a/libquicktime.spec b/libquicktime.spec index ed8b56d..6a280cb 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 55%{?rel_string}%{?dist} +Release: 56%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,10 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sun Aug 07 2022 RPM Fusion Release Engineering sergiomb@rpmfusion.org - 1.2.4-56.124.20210720git2729591 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg + 5.1 + * Sun Jun 12 2022 Sérgio Basto sergio@serjux.com - 1.2.4-55.124.20210720git2729591 - Mass rebuild for x264-0.164
commit 5c1be4fee0c05de0944799ce2a7b95e4965aba15 Author: Sérgio M. Basto sergio@serjux.com Date: Sun Jun 12 06:41:07 2022 +0100
Mass rebuild for x264-0.164
diff --git a/libquicktime.spec b/libquicktime.spec index e7339bc..ed8b56d 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 54%{?rel_string}%{?dist} +Release: 55%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sun Jun 12 2022 Sérgio Basto sergio@serjux.com - 1.2.4-55.124.20210720git2729591 +- Mass rebuild for x264-0.164 + * Wed Feb 16 2022 Sérgio Basto sergio@serjux.com - 1.2.4-54.124.20210720git2729591 - Update to 1.2.4.124.20210720git2729591 (ffmpeg completely borked the API with libavcodec version 59. disable libavcodec)
commit e2f883da72198c34f29535bd25a5a694ab9b5d9e Author: Sérgio M. Basto sergio@serjux.com Date: Wed Feb 16 14:53:30 2022 +0000
Update to 1.2.4.124.20210720git2729591 (ffmpeg completely borked the API with
libavcodec version 59. disable libavcodec)
diff --git a/.gitignore b/.gitignore index 7ece3c3..73c834b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libquicktime-1.2.4.tar.gz /libquicktime-git-859a717cef3c624c8e9125b0eaf4d10deb784e98.zip /libquicktime-git-fff99cdd4126f379ae538c4d3b09265242512384.zip /libquicktime-git-4e11b756462d21c941e2a2d636c234b4ab177552.zip +/libquicktime-git-27295919b3a1036ba8bc06cec414dcc501f72d89.zip diff --git a/libquicktime.spec b/libquicktime.spec index 438e680..e7339bc 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,13 +1,13 @@ %define vers_string 1.2.4-98-g859a717 -%define rel_string .122.20210314git4e11b75 -%define githash 4e11b756462d21c941e2a2d636c234b4ab177552 +%define rel_string .124.20210720git2729591 +%define githash 27295919b3a1036ba8bc06cec414dcc501f72d89 %define shorthash %(c=%{githash}; echo ${c:0:10})
Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 53%{?rel_string}%{?dist} +Release: 54%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,10 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Wed Feb 16 2022 Sérgio Basto sergio@serjux.com - 1.2.4-54.124.20210720git2729591 +- Update to 1.2.4.124.20210720git2729591 (ffmpeg completely borked the API with + libavcodec version 59. disable libavcodec) + * Wed Feb 09 2022 RPM Fusion Release Engineering sergiomb@rpmfusion.org - 1.2.4-53.122.20210314git4e11b75 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources index 9c0076e..54d0031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libquicktime-git-4e11b756462d21c941e2a2d636c234b4ab177552.zip) = 8bef48b130b59f5c8a06865cb69b0fc06f42dcb1f5938ddd643764b91d8ec81cb7cffb5e4a7e9619b48b5b5adb4c2ba4cf51ecac026964aafe190b454e00ddff +SHA512 (libquicktime-git-27295919b3a1036ba8bc06cec414dcc501f72d89.zip) = 67c45fa98c3d7a11dda8ea2cd203c7068f7855dd9da07f2409730edd52fe95fe48367f90f9b2b52de161445f089484345347210fc1e447349ad9e227d61f06c3
commit db4c042266259fbab8f1e4767ae72d2b0b98e4ac Author: Sérgio M. Basto sergio@serjux.com Date: Wed Feb 9 15:16:10 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Sérgio M. Basto sergio@serjux.com
diff --git a/libquicktime.spec b/libquicktime.spec index 11cc211..438e680 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 52%{?rel_string}%{?dist} +Release: 53%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Wed Feb 09 2022 RPM Fusion Release Engineering sergiomb@rpmfusion.org - 1.2.4-53.122.20210314git4e11b75 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Aug 03 2021 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-52.122.20210314git4e11b75 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit 1b4590fe24b6436c62fa44cdf4b31c8846a0947f Author: Leigh Scott leigh123linux@gmail.com Date: Tue Aug 3 10:54:12 2021 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Leigh Scott leigh123linux@gmail.com
diff --git a/libquicktime.spec b/libquicktime.spec index a94a485..11cc211 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 51%{?rel_string}%{?dist} +Release: 52%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Aug 03 2021 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-52.122.20210314git4e11b75 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 10 2021 Sérgio Basto sergio@serjux.com - 1.2.4-51.122.20210314git4e11b75 - Update to 1.2.4.122.20210314git4e11b75 from branch master
commit 1887da2581f4c1aa806191950796f3e923dbd8e3 Author: Sérgio M. Basto sergio@serjux.com Date: Sun Jul 11 13:45:29 2021 +0100
Update to 1.2.4.122.20210314git4e11b75 from branch master
diff --git a/.gitignore b/.gitignore index 8528cb5..7ece3c3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libquicktime-1.2.4.tar.gz /libquicktime-git-4d451774b89fbdd2f53204f92b71837af7b06761.zip /libquicktime-git-859a717cef3c624c8e9125b0eaf4d10deb784e98.zip /libquicktime-git-fff99cdd4126f379ae538c4d3b09265242512384.zip +/libquicktime-git-4e11b756462d21c941e2a2d636c234b4ab177552.zip diff --git a/libquicktime.spec b/libquicktime.spec index e4c21b7..a94a485 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,13 +1,13 @@ %define vers_string 1.2.4-98-g859a717 -%define rel_string .112.20180804gitfff99cd -%define githash fff99cdd4126f379ae538c4d3b09265242512384 +%define rel_string .122.20210314git4e11b75 +%define githash 4e11b756462d21c941e2a2d636c234b4ab177552 %define shorthash %(c=%{githash}; echo ${c:0:10})
Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 50%{?rel_string}%{?dist} +Release: 51%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sat Jul 10 2021 Sérgio Basto sergio@serjux.com - 1.2.4-51.122.20210314git4e11b75 +- Update to 1.2.4.122.20210314git4e11b75 from branch master + * Sat Jul 10 2021 Sérgio Basto sergio@serjux.com - 1.2.4-50.112.20180804gitfff99cd - Mass rebuild for x264-0.163
diff --git a/sources b/sources index ccfd430..9c0076e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0edc1b41e7f5143fb0c6bcfb501fc912 libquicktime-git-fff99cdd4126f379ae538c4d3b09265242512384.zip +SHA512 (libquicktime-git-4e11b756462d21c941e2a2d636c234b4ab177552.zip) = 8bef48b130b59f5c8a06865cb69b0fc06f42dcb1f5938ddd643764b91d8ec81cb7cffb5e4a7e9619b48b5b5adb4c2ba4cf51ecac026964aafe190b454e00ddff
commit 2c91b756ce45e8755f5d8712403e950060606fb3 Author: Sérgio M. Basto sergio@serjux.com Date: Sat Jul 10 21:57:15 2021 +0100
Mass rebuild for x264-0.163
diff --git a/libquicktime.spec b/libquicktime.spec index 8f0d243..e4c21b7 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 49%{?rel_string}%{?dist} +Release: 50%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sat Jul 10 2021 Sérgio Basto sergio@serjux.com - 1.2.4-50.112.20180804gitfff99cd +- Mass rebuild for x264-0.163 + * Wed Feb 03 2021 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-49.112.20180804gitfff99cd - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit 1fe6622dc0d0249c99a48d23ce11b7fdade436ad Author: Leigh Scott leigh123linux@gmail.com Date: Wed Feb 3 18:07:50 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Leigh Scott leigh123linux@gmail.com
diff --git a/libquicktime.spec b/libquicktime.spec index ad42da6..8f0d243 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 48%{?rel_string}%{?dist} +Release: 49%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Wed Feb 03 2021 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-49.112.20180804gitfff99cd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 1 2021 Leigh Scott leigh123linux@gmail.com - 1.2.4-48.112.20180804gitfff99cd - Rebuilt for new ffmpeg snapshot
commit 04a67ffe16ebe646c1fd3ddf12c16ce451c08a7d Author: Leigh Scott leigh123linux@gmail.com Date: Fri Jan 1 03:29:29 2021 +0000
Rebuilt for new ffmpeg snapshot
diff --git a/libquicktime.spec b/libquicktime.spec index 4e23885..ad42da6 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 47%{?rel_string}%{?dist} +Release: 48%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Fri Jan 1 2021 Leigh Scott leigh123linux@gmail.com - 1.2.4-48.112.20180804gitfff99cd +- Rebuilt for new ffmpeg snapshot + * Fri Nov 27 2020 Sérgio Basto sergio@serjux.com - 1.2.4-47.112.20180804gitfff99cd - Mass rebuild for x264-0.161
commit a3087673df8ccaa849eda6605a0e41ab66a6c7f2 Author: Sérgio M. Basto sergio@serjux.com Date: Fri Nov 27 13:05:48 2020 +0000
Mass rebuild for x264-0.161
diff --git a/libquicktime.spec b/libquicktime.spec index f79c244..4e23885 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 46%{?rel_string}%{?dist} +Release: 47%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Fri Nov 27 2020 Sérgio Basto sergio@serjux.com - 1.2.4-47.112.20180804gitfff99cd +- Mass rebuild for x264-0.161 + * Fri Nov 27 2020 Sérgio Basto sergio@serjux.com - 1.2.4-46.112.20180804gitfff99cd - Mass rebuild for x264-0.161
commit 671feb97527510909e301aa9aabc2d531db984c1 Author: Sérgio M. Basto sergio@serjux.com Date: Fri Nov 27 10:18:38 2020 +0000
Mass rebuild for x264-0.161
diff --git a/libquicktime.spec b/libquicktime.spec index 1bf9f0d..f79c244 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 45%{?rel_string}%{?dist} +Release: 46%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Fri Nov 27 2020 Sérgio Basto sergio@serjux.com - 1.2.4-46.112.20180804gitfff99cd +- Mass rebuild for x264-0.161 + * Tue Aug 18 2020 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-45.112.20180804gitfff99cd - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit c1dd41b800f8acd7ac544e277a2dc224505cefbf Author: Leigh Scott leigh123linux@gmail.com Date: Tue Aug 18 15:35:36 2020 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Leigh Scott leigh123linux@gmail.com
diff --git a/libquicktime.spec b/libquicktime.spec index 87f3a50..1bf9f0d 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 44%{?rel_string}%{?dist} +Release: 45%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Aug 18 2020 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-45.112.20180804gitfff99cd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 07 2020 Sérgio Basto sergio@serjux.com - 1.2.4-44.112.20180804gitfff99cd - Mass rebuild for x264
commit e5add975167aea80b9f66c8477101319499d516e Author: Sérgio M. Basto sergio@serjux.com Date: Tue Jul 7 03:57:57 2020 +0100
Mass rebuild for x264
diff --git a/libquicktime.spec b/libquicktime.spec index 9e9e7d8..87f3a50 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 43%{?rel_string}%{?dist} +Release: 44%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Jul 07 2020 Sérgio Basto sergio@serjux.com - 1.2.4-44.112.20180804gitfff99cd +- Mass rebuild for x264 + * Thu Mar 12 2020 Leigh Scott leigh123linux@gmail.com - 1.2.4-43.112.20180804gitfff99cd - Rebuilt for i686
commit 1181b8c0aefcdc6d77000394c6b2be817c64ac4a Author: Leigh Scott leigh123linux@gmail.com Date: Thu Mar 12 18:53:39 2020 +0000
Rebuilt for i686
diff --git a/libquicktime.spec b/libquicktime.spec index 2346d69..9e9e7d8 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 42%{?rel_string}%{?dist} +Release: 43%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Thu Mar 12 2020 Leigh Scott leigh123linux@gmail.com - 1.2.4-43.112.20180804gitfff99cd +- Rebuilt for i686 + * Sat Feb 22 2020 RPM Fusion Release Engineering leigh123linux@googlemail.com - 1.2.4-42.112.20180804gitfff99cd - Rebuild for ffmpeg-4.3 git
commit b5cdb94f7e578f102df84d5ea26dfbbfb823c84e Author: leigh123linux leigh123linux@googlemail.com Date: Sat Feb 22 15:15:32 2020 +0000
- Rebuild for ffmpeg-4.3 git
Signed-off-by: leigh123linux leigh123linux@googlemail.com
diff --git a/libquicktime.spec b/libquicktime.spec index 95058ec..2346d69 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 41%{?rel_string}%{?dist} +Release: 42%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sat Feb 22 2020 RPM Fusion Release Engineering leigh123linux@googlemail.com - 1.2.4-42.112.20180804gitfff99cd +- Rebuild for ffmpeg-4.3 git + * Tue Feb 04 2020 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-41.112.20180804gitfff99cd - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 2a8b23c837e0027e4232d39a5bbf034d8c1329b2 Author: leigh123linux leigh123linux@googlemail.com Date: Tue Feb 4 23:15:28 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: leigh123linux leigh123linux@googlemail.com
diff --git a/libquicktime.spec b/libquicktime.spec index e7a78a2..95058ec 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 40%{?rel_string}%{?dist} +Release: 41%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Feb 04 2020 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-41.112.20180804gitfff99cd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Dec 17 2019 Leigh Scott leigh123linux@gmail.com - 1.2.4-40.112.20180804gitfff99cd - Mass rebuild for x264
commit cfb65aa4fead9a0c9562887c63dba341459497f2 Author: Leigh Scott leigh123linux@gmail.com Date: Tue Dec 17 12:24:30 2019 +0000
Mass rebuild for x264
diff --git a/libquicktime.spec b/libquicktime.spec index 8ad8888..e7a78a2 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 39%{?rel_string}%{?dist} +Release: 40%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Dec 17 2019 Leigh Scott leigh123linux@gmail.com - 1.2.4-40.112.20180804gitfff99cd +- Mass rebuild for x264 + * Tue Aug 06 2019 Leigh Scott leigh123linux@gmail.com - 1.2.4-39.112.20180804gitfff99cd - Rebuild for new ffmpeg version
commit 5dbdd9de94e4e57500a01e4f69386ffd10a9c876 Author: Leigh Scott leigh123linux@gmail.com Date: Tue Aug 6 22:13:32 2019 +0100
Rebuild for new ffmpeg version
diff --git a/libquicktime.spec b/libquicktime.spec index e91b11b..8ad8888 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 37%{?rel_string}%{?dist} +Release: 39%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,12 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Aug 06 2019 Leigh Scott leigh123linux@gmail.com - 1.2.4-39.112.20180804gitfff99cd +- Rebuild for new ffmpeg version + +* Tue Aug 06 2019 Leigh Scott leigh123linux@gmail.com - 1.2.4-38.112.20180804gitfff99cd +- Rebuild for new ffmpeg version + * Tue Mar 12 2019 Sérgio Basto sergio@serjux.com - 1.2.4-37.112.20180804gitfff99cd - Mass rebuild for x264
commit cc61de5af79efd39f230c79f8aef434c06a781d7 Author: Sérgio M. Basto sergio@serjux.com Date: Tue Mar 12 03:34:58 2019 +0000
Mass rebuild for x264
diff --git a/libquicktime.spec b/libquicktime.spec index 750563f..e91b11b 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 36%{?rel_string}%{?dist} +Release: 37%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Mar 12 2019 Sérgio Basto sergio@serjux.com - 1.2.4-37.112.20180804gitfff99cd +- Mass rebuild for x264 + * Mon Mar 04 2019 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-36.112.20180804gitfff99cd - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 3c79c5bdc19a28caec91d6ce6f767a0ee7fb14be Author: Leigh Scott leigh123linux@googlemail.com Date: Mon Mar 4 15:04:41 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Leigh Scott leigh123linux@googlemail.com
diff --git a/libquicktime.spec b/libquicktime.spec index 49dcde9..750563f 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 35%{?rel_string}%{?dist} +Release: 36%{?rel_string}%{?dist} License: LGPLv2+ URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... @@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Mon Mar 04 2019 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-36.112.20180804gitfff99cd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Nov 12 2018 Antonio Trande sagitter@fedoraproject.org - 1.2.4-35.112.20180804gitfff99cd - Rebuild for ffmpeg-3.* on el7 - Set ld scriptlets
commit bfd48049a3a558f7cbb0d66df49e52b8cc008d39 Author: sagitter sagitter@fedoraproject.org Date: Thu Dec 6 15:43:48 2018 +0100
Rebuild for ffmpeg-3.* on el7
diff --git a/libquicktime.spec b/libquicktime.spec index 871d1b6..49dcde9 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,12 +7,13 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 34%{?rel_string}%{?dist} +Release: 35%{?rel_string}%{?dist} License: LGPLv2+ -Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic...
+BuildRequires: gcc +%{?el7:BuildRequires: epel-rpm-macros} BuildRequires: libdv-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel @@ -40,11 +41,9 @@ BuildRequires: autoconf automake libtool
%package utils Summary: Utilities for working with Quicktime files -Group: Applications/Multimedia
%package devel Summary: Development files for libquicktime -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: zlib-devel
@@ -74,7 +73,7 @@ enhancements. This package contains development files for %{name}. # --------------------------------------------------------------------
%prep -%setup -q -n %{name}-git-%{githash} +%autosetup -n %{name}-git-%{githash}
# --------------------------------------------------------------------
@@ -108,15 +107,13 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ;
# --------------------------------------------------------------------
-%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets
%files -f %{name}.lang %license COPYING %doc README TODO %{_libdir}/%{name}*.so.* -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/lqt_*.so +%{_libdir}/%{name}/
%files utils %{_bindir}/libquicktime_config @@ -140,6 +137,11 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Mon Nov 12 2018 Antonio Trande sagitter@fedoraproject.org - 1.2.4-35.112.20180804gitfff99cd +- Rebuild for ffmpeg-3.* on el7 +- Set ld scriptlets +- Remove obsolete Group tags + * Thu Oct 11 2018 Sérgio Basto sergio@serjux.com - 1.2.4-34.112.20180804gitfff99cd - Rebuild for x264 in F29 - Expand tabs to spaces
commit 138209a4466736e2fb84e61823d3b78208b266ec Author: Sérgio M. Basto sergio@serjux.com Date: Thu Oct 11 09:20:35 2018 +0100
Rebuild for x264 in F29 Expand tabs to spaces
diff --git a/libquicktime.spec b/libquicktime.spec index d25cd1c..871d1b6 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -4,39 +4,49 @@ %define shorthash %(c=%{githash}; echo ${c:0:10})
-Summary: Library for reading and writing Quicktime files -Name: libquicktime -Version: 1.2.4 -Release: 33%{?rel_string}%{?dist} -License: LGPLv2+ -Group: System Environment/Libraries -URL: http://libquicktime.sourceforge.net/ -Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... - -BuildRequires: libdv-devel -BuildRequires: libpng-devel libjpeg-devel libGLU-devel -BuildRequires: libvorbis-devel ffmpeg-devel -BuildRequires: schroedinger-devel -BuildRequires: lame-devel alsa-lib-devel libXt-devel libXaw-devel libXv-devel -BuildRequires: libdv-devel >= 0.102-4 x264-devel faad2-devel -BuildRequires: libavc1394-devel libraw1394-devel >= 0.9.0-12 -BuildRequires: gtk2-devel >= 2.4.0 +Summary: Library for reading and writing Quicktime files +Name: libquicktime +Version: 1.2.4 +Release: 34%{?rel_string}%{?dist} +License: LGPLv2+ +Group: System Environment/Libraries +URL: http://libquicktime.sourceforge.net/ +Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic... + +BuildRequires: libdv-devel +BuildRequires: libpng-devel +BuildRequires: libjpeg-devel +BuildRequires: libGLU-devel +BuildRequires: libvorbis-devel +BuildRequires: ffmpeg-devel +BuildRequires: schroedinger-devel +BuildRequires: lame-devel +BuildRequires: alsa-lib-devel +BuildRequires: libXt-devel +BuildRequires: libXaw-devel +BuildRequires: libXv-devel +BuildRequires: libdv-devel >= 0.102-4 +BuildRequires: x264-devel +BuildRequires: faad2-devel +BuildRequires: libavc1394-devel +BuildRequires: libraw1394-devel >= 0.9.0-12 +BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: schroedinger-devel BuildRequires: gettext-devel %{?_with_faac:BuildRequires: faac-devel}
# Packages for re-configuration -BuildRequires: autoconf, automake, libtool +BuildRequires: autoconf automake libtool
%package utils -Summary: Utilities for working with Quicktime files -Group: Applications/Multimedia +Summary: Utilities for working with Quicktime files +Group: Applications/Multimedia
%package devel -Summary: Development files for libquicktime -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: zlib-devel +Summary: Development files for libquicktime +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: zlib-devel
# --------------------------------------------------------------------
@@ -71,14 +81,14 @@ enhancements. This package contains development files for %{name}. %build ./autogen.sh %configure \ - --enable-gpl \ - --disable-rpath \ - --with-cpuflags="$RPM_OPT_FLAGS" \ - --disable-dependency-tracking \ - --without-doxygen \ - --disable-static \ - --with-libdv \ - --enable-libswscale + --enable-gpl \ + --disable-rpath \ + --with-cpuflags="$RPM_OPT_FLAGS" \ + --disable-dependency-tracking \ + --without-doxygen \ + --disable-static \ + --with-libdv \ + --enable-libswscale
# remove rpath from libtool sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -130,6 +140,10 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Thu Oct 11 2018 Sérgio Basto sergio@serjux.com - 1.2.4-34.112.20180804gitfff99cd +- Rebuild for x264 in F29 +- Expand tabs to spaces + * Fri Oct 05 2018 Sérgio Basto sergio@serjux.com - 1.2.4-33.112.20180804gitfff99cd - Update to 1.2.4.112.20180804gitfff99cd from branch master
@@ -438,4 +452,4 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; - Major fix from from Diag (plugins are now in the package).
* Wed Apr 16 2003 Dams <anvil[AT]livna.org> -- Initial build. +- Initial build.
commit 459c21e4a8264b3d1b7cdcf492cee5318df40596 Author: Sérgio M. Basto sergio@serjux.com Date: Fri Oct 5 06:04:25 2018 +0100
Update branches in update script
diff --git a/update_libquicktime.sh b/update_libquicktime.sh index 90d50b3..eaf4716 100755 --- a/update_libquicktime.sh +++ b/update_libquicktime.sh @@ -24,8 +24,8 @@ rfpkg ci -c && git show echo Press enter to continue; read dummy; rfpkg push && rfpkg build --nowait echo Press enter to continue; read dummy; -git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master +git checkout f29 && git merge master && git push && rfpkg build --nowait; git checkout master echo Press enter to continue; read dummy; -git checkout f26 && git merge master && git push && rfpkg build --nowait; git checkout master +git checkout f28 && git merge master && git push && rfpkg build --nowait; git checkout master echo Press enter to continue; read dummy; git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
commit fb01f589eb42cef25e71748fcc4d5775f8bf3005 Author: Sérgio M. Basto sergio@serjux.com Date: Fri Oct 5 06:02:38 2018 +0100
Update to 1.2.4.112.20180804gitfff99cd from branch master
diff --git a/.gitignore b/.gitignore index 850df18..8528cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libquicktime-1.2.4.tar.gz /libquicktime-1.2.4-4d451774b8.tar.gz /libquicktime-git-4d451774b89fbdd2f53204f92b71837af7b06761.zip /libquicktime-git-859a717cef3c624c8e9125b0eaf4d10deb784e98.zip +/libquicktime-git-fff99cdd4126f379ae538c4d3b09265242512384.zip diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index a8e6142..0000000 --- a/ChangeLog +++ /dev/null @@ -1,618 +0,0 @@ -commit 859a717cef3c624c8e9125b0eaf4d10deb784e98 -Author: Steven Schultz sms@Stevens-Mac-mini.local -Date: Fri Feb 2 13:03:32 2018 -0600 - - remove m4/avcodec.m4, not needed with changes to configure.ac - -commit 9349111e99620426d1b258e3e3940fc44ccbdf1a -Author: Steven Schultz sms@Stevens-Mac-mini.local -Date: Fri Feb 2 13:01:22 2018 -0600 - - don't need avcodec.m4 with changes to configure.ac - -commit 8b4929f014b7ad83665e292423daeea4224f2526 -Author: Steven Schultz sms@Stevens-Mac-mini.local -Date: Fri Feb 2 12:58:15 2018 -0600 - - cleanup the libavcode and libswscale version checking - -commit 8569de48eaac91aa9edab6e4e411802571e23a05 -Author: Steven Schultz sms@Stevens-Mac-mini.local -Date: Fri Feb 2 12:56:27 2018 -0600 - - since it doesn't compile with modern ffmpeg might as well clean it up - -commit 7992b2f105eeba0ec088cf7c0870d7f957a29608 -Author: Steven Schultz sms@Stevens-Mac-mini.local -Date: Thu Feb 1 10:24:50 2018 -0600 - - libavcodec can not be built due to completely incompatible API. Major version - 54 was the last known version to build with ffmpeg/libavcodec and the current - version is 58. - - Effectively disable libavcodec until someone figures out how to overhaul - libquicktime to build with current ffmpeg/libavcodec - -commit 4d451774b89fbdd2f53204f92b71837af7b06761 -Author: gmerlin <gmerlin> -Date: Tue Sep 26 11:46:13 2017 +0000 - - * Support for version 1 of the mdhd atom (patch by Erik Johansson) - -commit f32646eb76a6d2b2768442bd78afb65e7cb5867e -Author: gmerlin <gmerlin> -Date: Tue Jul 18 14:15:30 2017 +0000 - - * Applied udta.patch - -commit bfe392e31eea480d7c4507663395ca483a5abb67 -Author: gmerlin <gmerlin> -Date: Fri Jun 23 13:46:41 2017 +0000 - - * Fixed CVE-2017-9125 - -commit 3a7b5017e5d803dbe82eddd08a2804be3fda0c5d -Author: gmerlin <gmerlin> -Date: Fri Jun 23 13:00:36 2017 +0000 - - * Fixed allocation-failed-in_quicktime_read_ftyp and - allocation-failed-in_quicktime_read_info - -commit bf6e842131fb013a087df6d7c5069a7d3646b199 -Author: gmerlin <gmerlin> -Date: Mon Mar 6 10:16:11 2017 +0000 - - * Fix security hole - -commit 2ea10548de96c3379da6264e6ca21ee3cdc06f0c -Author: gmerlin <gmerlin> -Date: Tue Apr 26 18:04:01 2016 +0000 - - * Security fix - -commit c166ad0b5d00265d6a0a708ed1d39772bfaa8a91 -Author: gmerlin <gmerlin> -Date: Tue Apr 26 17:51:07 2016 +0000 - - * Fix the types of some integer i/o functions (patch by Erik Johansson) - -commit 0b908b27ac3acd25a73f72a25ac1b6ffc86d0567 -Author: gmerlin <gmerlin> -Date: Tue Apr 26 17:47:30 2016 +0000 - - * Fix issue with stps-atom and packetindex (patch by Erik Johansson) - -commit 1698b8b3f46c46a46e5efb856e19ec952b4f8b92 -Author: sms00 <sms00> -Date: Sun Dec 6 18:49:50 2015 +0000 - - Remove unused functions. - -commit 18487486657ba752bf38656509e719b5c5b2c51b -Author: sms00 <sms00> -Date: Sat Dec 5 18:52:43 2015 +0000 - - ffmpeg's neverending api changes - they went AV crazy (again/still). Needed to add AV_ or AV in front of items used from avcodec - -commit 12a6d2878e63d2c602e6f00612450fa8e377f322 -Author: gmerlin <gmerlin> -Date: Wed Oct 21 15:38:33 2015 +0000 - - * Fix Integer over flow in stts.c and quicktime_stsdtable_read_timecode - patch by Erik Johansson - -commit f224f75ee4a33c565ddfb2db82c8ea3d38bbb517 -Author: gmerlin <gmerlin> -Date: Fri Mar 20 10:00:56 2015 +0000 - - * Fix stsd atom termination (patch by Balázs Oroszi) - -commit 3407dafde9dc28b796059f5932b0be097626fd22 -Author: sms00 <sms00> -Date: Fri Mar 6 20:40:23 2015 +0000 - - annotate the new additions for rear surround and matrixed (Prologic) channels - -commit d20fd20cb0f274a0f34371583e745f23021c20f1 -Author: sms00 <sms00> -Date: Fri Mar 6 15:14:09 2015 +0000 - - Add mappings from 'chan atom' to lqt for: rear surround left/right, mono and left/right total (prologic matrix'd) - -commit 531270f7db23760e6ebbd6cab493550b4ca1c7fd -Author: gmerlin <gmerlin> -Date: Tue Feb 3 15:45:59 2015 +0000 - - * Read reserved gmin bits (patch by Derek Chow) - -commit 8e22e547d68b048e2936cdaab792a812e4b53941 -Author: sms00 <sms00> -Date: Mon Nov 3 20:48:22 2014 +0000 - - Prevent crash if audio Decoder doesn't exist - example is 'drms' - [codecs] Warning: Could not find audio Decoder for fourcc drms - for soundtracks in iTunes movies would crash qtinfo. - -commit 28412a2a639b5ff2078f52c253c8c23810a11bbd -Author: sms00 <sms00> -Date: Fri Oct 24 15:14:27 2014 +0000 - - returning 0 from the decode initialization causes lqt_ensure_stream_cmodel_decode to not fill in the color model. - - qtinfo would print "Native colormodel: Undefined" before. Now qtinfo prints - "Native colormodel: YUV 4:2:2 packed (YUY2)" - -commit 54513401b82b6c4dd5f2484420933ff71862e5f2 -Author: gmerlin <gmerlin> -Date: Thu Oct 23 15:12:09 2014 +0000 - - * Fixed stts generation - -commit 06cc79271551b43551d13fa27175ada88461126d -Author: gmerlin <gmerlin> -Date: Thu May 1 22:54:30 2014 +0000 - - * More cleanups - -commit 2a9ca087b733aa4922d110c99b28e5c3c3227798 -Author: gmerlin <gmerlin> -Date: Thu May 1 21:15:34 2014 +0000 - - * Remove quicktime_chunk_to_offset - -commit 5d2cf083a9e2f70b88403984ed9a3ed060c43953 -Author: gmerlin <gmerlin> -Date: Thu May 1 18:58:38 2014 +0000 - - * More cleanups - -commit 7819adf04207d52757237ffec7f87ebb8f6f84a4 -Author: gmerlin <gmerlin> -Date: Thu May 1 18:54:00 2014 +0000 - - * Let the text tracks also use the packet index - * Removed lots of old cruft - -commit e3b9f0fe2691f1bf491c94821e5c92b78d1524ba -Author: gmerlin <gmerlin> -Date: Thu May 1 12:58:16 2014 +0000 - - * Move most video specific functions to video.c - -commit 9cb33b4813cd8fb1743b7a8e00299dfef3df703a -Author: gmerlin <gmerlin> -Date: Thu May 1 12:07:28 2014 +0000 - - * Removed old decode_audio function - -commit 1c63349eeedbfc8de05f71513cb3d729983cdd5a -Author: gmerlin <gmerlin> -Date: Tue Apr 29 22:21:55 2014 +0000 - - * Converted core and all codecs for new Audio demuxing API - -commit 223e3c392d29ac8f59a3d2533ce08cfb85226865 -Author: gmerlin <gmerlin> -Date: Sun Apr 27 22:59:54 2014 +0000 - - * Introduce quicktime_trak_read_packet() - * New codec function: decode_audio_packet() which decodes just one - single packet and leaves buffering and seeking to the core - * Audio seeking is not adapted yet but will be ASAP, so it might not work - ATM - -commit 73b6a91c7f589e0ff67e9861fa24e5b2c3b6d3fe -Author: gmerlin <gmerlin> -Date: Fri Apr 25 21:55:28 2014 +0000 - - * Remove old ffmpeg cruft and increase the minimum lavc version - -commit d92d1917f06e877d46a5a61159d6228e02f92967 -Author: gmerlin <gmerlin> -Date: Wed Apr 23 22:24:04 2014 +0000 - - * New decoding API works somehow - -commit 1a6fbf08be64eca0842095cf7005f475c51e40cb -Author: gmerlin <gmerlin> -Date: Wed Apr 23 20:45:45 2014 +0000 - - * More API conversions - -commit 6e91b8b1cb9255cdefbf5462bc2b6288f4b6b216 -Author: sms00 <sms00> -Date: Wed Apr 23 20:35:32 2014 +0000 - - Accidentally commented AC_LANG_SOURCE(C) out - it causes errors with older - versions of libtool (used on OSX 10.6.8) but other folks perhaps need it. - libquicktime build fine with or without it - not sure why it was added. - -commit 766fd107dbe03cfad9b5d03ea1803802214d0729 -Author: sms00 <sms00> -Date: Wed Apr 23 20:33:04 2014 +0000 - - lqt_packet_index_get_next_display_frame needs to be visible/extern'd on OSX 10.6.8 to avoid and undefined error from lqt_ffmpeg plugin: - qtinfo Disc1.mov - [codecinfo] Error: dlopen failed for /usr/local/lib/libquicktime/lqt_ffmpeg.so: dlopen(/usr/local/lib/libquicktime/lqt_ffmpeg.so, 2): Symbol not found: _lqt_packet_index_get_next_display_frame - Referenced from: /usr/local/lib/libquicktime/lqt_ffmpeg.so - -commit 4ed5f10623b438f959697b03a56ec94a76b25271 -Author: gmerlin <gmerlin> -Date: Wed Apr 23 20:31:17 2014 +0000 - - * Converted more codecs - -commit 4ee0b65979fa2a405727f8ce0f6372c5e3767f91 -Author: gmerlin <gmerlin> -Date: Tue Apr 22 19:14:48 2014 +0000 - - * Convert more codecs for the new API - -commit f12c0601b1fd6edca13cdf2d96987d569dd7682a -Author: gmerlin <gmerlin> -Date: Mon Apr 21 06:39:17 2014 +0000 - - * More updates for the new demuxing API - -commit bd67b98a7d0f7f53a22c8467b765c5e181358ab1 -Author: gmerlin <gmerlin> -Date: Fri Apr 18 12:30:19 2014 +0000 - - * Converted pcm and ima4 - -commit e987e5901de61ef0f0f784eb4fc83c5eeca498b9 -Author: gmerlin <gmerlin> -Date: Fri Apr 18 00:55:12 2014 +0000 - - * Make the pcm codecs use the packet index - -commit d6b9f1c25189302b1fce2e0a69e0a8538b82752b -Author: gmerlin <gmerlin> -Date: Wed Apr 16 22:20:52 2014 +0000 - - * Use new demuxing API for reading video packets - -commit a7e10e7b8a6a16939c2b5f6bd33f010ec42942d7 -Author: gmerlin <gmerlin> -Date: Tue Apr 15 18:46:42 2014 +0000 - - * Export the stsd ID in the packet index - -commit 37553b919395e48b5db643da29667bb094f5dbdc -Author: gmerlin <gmerlin> -Date: Fri Apr 11 22:15:09 2014 +0000 - - * generate packet index for audio tracks also - -commit dfcacedaafb89817fde58f48e4e44890274e0778 -Author: gmerlin <gmerlin> -Date: Sun Apr 6 22:35:50 2014 +0000 - - * Generate the packet index for Quicktime and AVI video streams - -commit 2ef27c3d2bfaf642622734176e25a005a20a92d1 -Author: gmerlin <gmerlin> -Date: Tue Apr 1 19:57:30 2014 +0000 - - * Introduce a runtime generated packet index for more efficient - demultiplexing - -commit 0c25e15dc829e69c9f9eb406f856ec0721dd6aaa -Author: gmerlin <gmerlin> -Date: Tue Mar 25 16:57:33 2014 +0000 - - * Update - -commit edb79560e0d5c895e23ea048a8444b521a039547 -Author: gmerlin <gmerlin> -Date: Fri Mar 21 13:30:41 2014 +0000 - - * Initialize tcmi flags to zero as recommended - -commit fee30f795236298e8c9548e09da99c3fd7c446de -Author: gmerlin <gmerlin> -Date: Fri Mar 21 11:58:28 2014 +0000 - - * Skip null blocks patch by Erik Johansson - -commit f4a7b6aded4f44bf6d9896a5e5df4d1a2c875e29 -Author: gmerlin <gmerlin> -Date: Mon Dec 9 16:03:40 2013 +0000 - - * Better price calculation for colormodel conversions - (patch by Erik Johansson) - -commit 0ce3b70a3858eac940aae4e47b1ea3a0e5f8c237 -Author: gmerlin <gmerlin> -Date: Fri Dec 6 15:59:34 2013 +0000 - - * yuvj420 -> yuvj422 Conversion patch by Erik Johansson - -commit 78f4862934b495e7bbaf8452ec247630a6f2bf89 -Author: gmerlin <gmerlin> -Date: Wed Nov 27 17:15:31 2013 +0000 - - * Flush more delayed frames (patch by Erik Johansson) - -commit 0bede77253913493c52b76a1e3d793ce92130326 -Author: gmerlin <gmerlin> -Date: Wed Nov 27 17:09:30 2013 +0000 - - * Mingw fixes for utf-8 and 64 bit stat (patch by Derek Chow) - -commit 4773c54f5de8ab896cf329d160ec5f6476e37f37 -Author: gmerlin <gmerlin> -Date: Thu Nov 21 15:10:54 2013 +0000 - - * More mingw patches by Derek Chow - -commit b292819f366e0446afcb3c2428590acfd63616fe -Author: gmerlin <gmerlin> -Date: Tue Nov 19 16:46:23 2013 +0000 - - * mingw patch by Derek Chow - -commit 8b73d511668e71c3c1f6c57f629df556593b7fd1 -Author: gmerlin <gmerlin> -Date: Tue Oct 29 08:57:05 2013 +0000 - - * Set LDFLAGS for modules in configure.ac - * Fix some crashes (patch by Paul J. Taggart) - -commit 400e1e4e03f79bd2bf362ecf7fdd133d5075968f -Author: sms00 <sms00> -Date: Tue Oct 29 03:02:17 2013 +0000 - - Older versions of autoconf (2.61) sometimes need [] around the 'else' in AC_CHECK_FUNCS to avoid an error - ./configure: line 24695: syntax error: unexpected end of file - -commit f317d4ce065a61a95c28f70765fa4f740d875867 -Author: gmerlin <gmerlin> -Date: Mon Oct 7 14:38:02 2013 +0000 - - * Add -no-undefined to libtool flags - * Simplified *localtime* ifdefs - -commit 6dd6c14f7eac41b62f4fb6a7ad64ac435828f968 -Author: gmerlin <gmerlin> -Date: Fri Sep 27 13:46:43 2013 +0000 - - * mingw patches by Derek Chow - -commit 2afeae7edc5d45c6b835fa5bcf7b821b5c72b212 -Author: gmerlin <gmerlin> -Date: Fri Sep 27 13:23:39 2013 +0000 - - * bzero, bcopy -> memset, memcpy - -commit 3d30c039370c7d9893b2990e006641f6daea565a -Author: gmerlin <gmerlin> -Date: Fri Jun 7 14:36:20 2013 +0000 - - * Prores codec name patch by Boris Maksalov - -commit 823d5938a5bd0996882ea467ab25015f79958540 -Author: gmerlin <gmerlin> -Date: Wed Jun 5 15:10:48 2013 +0000 - - * Another API update patch by Erik Johansson - -commit ac79fc2ee5361bbb49a6fb337d0f23e02fdf7fdf -Author: gmerlin <gmerlin> -Date: Tue May 21 13:49:26 2013 +0000 - - * AVPacket handling patch by Joseph Artsimovich - -commit 220a1bd3cf1502fdb755be3a3771575f484b3e8b -Author: gmerlin <gmerlin> -Date: Tue May 21 13:42:20 2013 +0000 - - * 8 bit sowt seems to be signed - -commit 8d832fabb420fc42edacd914a560943ae9f069ba -Author: gmerlin <gmerlin> -Date: Tue May 7 09:30:01 2013 +0000 - - * Fix potential crash - -commit f23facd94acd3ff0c3be4efd6de82f69dd44fe87 -Author: gmerlin <gmerlin> -Date: Tue May 7 09:18:51 2013 +0000 - - * Latest ffmpeg patch by Joseph Artsimovich - -commit ab32b84dd1e6e5b100d22aeeffbafe67e02edb31 -Author: gmerlin <gmerlin> -Date: Mon Apr 29 08:30:54 2013 +0000 - - * Prime sample support patch by Erik Johansson - -commit eb0458dd42f28b094e2a4695758865109fb73669 -Author: gmerlin <gmerlin> -Date: Tue Apr 23 15:11:53 2013 +0000 - - * avid imx fix by Joseph Artsimovich - -commit 0b8adf13d39b8ba3717a6e8c86d6d59f3d68f711 -Author: gmerlin <gmerlin> -Date: Tue Apr 23 15:11:05 2013 +0000 - - * autotools fix proposed by Christian Ebert - -commit 44662bf4f5e1364140f08b26126f097986475435 -Author: sms00 <sms00> -Date: Sun Apr 21 21:54:58 2013 +0000 - - ffmpeg/libavcodec breakage again/still - define AVCODEC_MAX_AUDIO_FRAME_SIZE - using value from libavcodec/avcodec.h dated Dec 23 2012 - -commit 2158ea2e436cc5d635215078e6bcd7ec8aa7872c -Author: gmerlin <gmerlin> -Date: Fri Apr 19 16:59:59 2013 +0000 - - * Add avid IMX fourccs (patch by Joseph Artsimovich) - -commit 55f5d4523a96cdf2a45a3af81b8d251337c5d020 -Author: gmerlin <gmerlin> -Date: Tue Mar 19 10:29:58 2013 +0000 - - * libpng16 support patch by pgajdos [at] suse.cz - -commit 25ebfb6ae1a88586469d7524a82093ead13a3043 -Author: gmerlin <gmerlin> -Date: Tue Feb 12 17:34:23 2013 +0000 - - * Fix qmax for imx30 (patch by Joseph Artsimovich) - -commit d001f6e756cd9134b878d870686241fb4bddf4e9 -Author: gmerlin <gmerlin> -Date: Tue Feb 12 17:32:53 2013 +0000 - - * Better handling of broken frames (patch by Joseph Artsimovich) - -commit d0388b8915dd34fb3cb2e76978b1d9df6a5dc436 -Author: stscheff <stscheff> -Date: Sat Jan 12 13:02:30 2013 +0000 - - force movie timescale to qtvr timescale - -commit b31b4db0497e37aa07320022a71ea2544ea24b44 -Author: gmerlin <gmerlin> -Date: Fri Dec 21 13:37:09 2012 +0000 - - * Compatibility patch - -commit a63f3af8467bbd4fc6bb6384d0ca5902c2c46411 -Author: gmerlin <gmerlin> -Date: Tue Nov 27 15:52:47 2012 +0000 - - * Change vendor back to appl to work around broken decoders - -commit 812fb9a441592915a416dde10bf559b7162f4f51 -Author: gmerlin <gmerlin> -Date: Tue Nov 27 15:46:40 2012 +0000 - - * Fix pts handling for some codecs, which rely on a constant framerate - -commit b4691242da7909b3643e50c78dc03317a2c9c1ef -Author: gmerlin <gmerlin> -Date: Tue Nov 20 09:51:21 2012 +0000 - - * Forgot this file - -commit 3df140a62c0ea17307ea83b5fdae454d3df95ed5 -Author: gmerlin <gmerlin> -Date: Mon Nov 19 16:59:29 2012 +0000 - - * sdtp support patch by Joseph Artsimovich - -commit 1436e47438e8d4c40ade2fc1b98eddfef6f1e452 -Author: gmerlin <gmerlin> -Date: Mon Nov 19 16:50:48 2012 +0000 - - * uninitialized read patch by Joseph Artsimovich - * Updated schroedinger settings extraction - -commit b68705b23f206513220c625fc2b35241c6e62d9f -Author: gmerlin <gmerlin> -Date: Fri Nov 9 10:24:12 2012 +0000 - - * Let the codec initialization know if we are en- or decoding - (patch by Joseph Artsimovich) - -commit dbf163d577d78f974356ab2cad33fdf9ac3eaae6 -Author: gmerlin <gmerlin> -Date: Thu Nov 8 12:53:45 2012 +0000 - - * Fixed YUV10 to RGB888 conversion - -commit 6bb0b58264504ace379917be456f348f287dbaf1 -Author: gmerlin <gmerlin> -Date: Tue Nov 6 11:07:01 2012 +0000 - - * Use codec specific defaults - -commit bdacab2a502311ac858923a54347af727af3f07f -Author: gmerlin <gmerlin> -Date: Mon Oct 8 18:50:15 2012 +0000 - - * Fix crash - -commit a5a04a249493c2cb44c18024e84f5dcce73fb910 -Author: gmerlin <gmerlin> -Date: Mon Sep 24 09:17:25 2012 +0000 - - * Gop size patch by Joseph Artsimovich - -commit d5aad041e938f4484a7e5d034043834569e2545c -Author: gmerlin <gmerlin> -Date: Fri Sep 14 21:12:57 2012 +0000 - - * Simplify seeking and consider B-frames used as references - -commit 06ff9b12330b77e8aad95da5d0b4997d3eb1823f -Author: gmerlin <gmerlin> -Date: Tue Aug 7 17:36:11 2012 +0000 - - * ProRes support patch by Boris Maksalov - -commit 4d45f43a2ea5c598be9b700789b9f03fc88db806 -Author: gmerlin <gmerlin> -Date: Thu Jun 28 14:30:21 2012 +0000 - - * Support thread_count for more ffmpeg codecs (patch by Joseph Artsimovich) - -commit b9f7bf8f201208abe7c992370b19e1659246e862 -Author: gmerlin <gmerlin> -Date: Thu Jun 28 14:28:40 2012 +0000 - - * Delay the colormodel detection such that it happens after setting the - parameters - -commit a6dfc1c04cc6a9236613a26c1b9e21bbbc385af3 -Author: gmerlin <gmerlin> -Date: Tue Jun 12 16:30:57 2012 +0000 - - * Works also for mp4 - -commit adb2dc5b7305d0dfc9a65ea0d8fc4d914f2afac7 -Author: gmerlin <gmerlin> -Date: Tue Jun 12 16:27:58 2012 +0000 - - * Unified seeking patch by Joseph Artsimovich - -commit cdb2262a36c518b7b1d10b8a4c50e6e3a8131a92 -Author: gmerlin <gmerlin> -Date: Fri Jun 8 13:56:39 2012 +0000 - - * stps support by Joseph Artsimovich - -commit 962af75c8bae8493fd5f8aef3afac041c907b041 -Author: gmerlin <gmerlin> -Date: Fri Jun 8 13:56:13 2012 +0000 - - * stps and xdcam support patch by Joseph Artsimovich - -commit 7fac464e1d9220ace2a3f93d4cee3108cd62a0eb -Author: gmerlin <gmerlin> -Date: Fri Jun 8 12:25:42 2012 +0000 - - * Reverted last patch - -commit 59838700eec97a2e07d124b06be80b3c5b09001f -Author: gmerlin <gmerlin> -Date: Fri Jun 8 12:12:47 2012 +0000 - - * stps support patch by Joseph Artsimovich - -commit f36768d87314b85c7e84e6b8bfcdf6a6bedfd77c -Author: gmerlin <gmerlin> -Date: Thu May 24 16:01:13 2012 +0000 - - * Speed up seeking in long GOP video (patch by Joseph Artsimovich) - -commit e6294ee27c9a616f5ea8ce5b5778f0c3e77d258d -Author: gmerlin <gmerlin> -Date: Fri Apr 27 15:19:52 2012 +0000 - - * Get rid of PATH_MAX in the library diff --git a/libquicktime.spec b/libquicktime.spec index 69dd42d..d25cd1c 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,13 +1,13 @@ %define vers_string 1.2.4-98-g859a717 -%define rel_string .20180202.98.g859a717 -%define githash 859a717cef3c624c8e9125b0eaf4d10deb784e98 +%define rel_string .112.20180804gitfff99cd +%define githash fff99cdd4126f379ae538c4d3b09265242512384 %define shorthash %(c=%{githash}; echo ${c:0:10})
Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 32%{?rel_string}%{?dist} +Release: 33%{?rel_string}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Fri Oct 05 2018 Sérgio Basto sergio@serjux.com - 1.2.4-33.112.20180804gitfff99cd +- Update to 1.2.4.112.20180804gitfff99cd from branch master + * Thu Oct 04 2018 Sérgio Basto sergio@serjux.com - 1.2.4-32.20180202.98.g859a717 - Mass rebuild for x264 and/or x265
diff --git a/sources b/sources index e61e18c..ccfd430 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55aa87d3e9fdeb15191c765b317b9a98 libquicktime-git-859a717cef3c624c8e9125b0eaf4d10deb784e98.zip +0edc1b41e7f5143fb0c6bcfb501fc912 libquicktime-git-fff99cdd4126f379ae538c4d3b09265242512384.zip diff --git a/update_libquicktime.sh b/update_libquicktime.sh index f8618fa..90d50b3 100755 --- a/update_libquicktime.sh +++ b/update_libquicktime.sh @@ -1,26 +1,25 @@ -git clone git://github.com/sergiomb2/libquicktime.git +git clone https://sergiomb@git.code.sf.net/p/libquicktime/git libquicktime version=1.2.4 tag=$version branch=master pushd libquicktime git checkout $branch git pull -git log $tag..HEAD > ../ChangeLog +#git log $tag..HEAD > ../ChangeLog newdescrib=$(git describe --tags) date=$(git log -1 --format=%cd --date=short | tr -d -) -relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/^/.$date/") +relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/.g/.${date}git/") githash=$(git rev-parse HEAD) shorthash=$(echo $githash | cut -b -10) popd #git checkout libquicktime.spec -sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" libquicktime.spec +#sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" libquicktime.spec sed -i "s|^%define rel_string .*|%define rel_string $relversion|" libquicktime.spec sed -i "s|^%define githash .*|%define githash $githash|" libquicktime.spec -rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" libquicktime.spec +rpmdev-bumpspec -c "Update to $version$relversion from branch $branch" libquicktime.spec spectool -g libquicktime.spec echo Press enter to run: rfpkg new-sources libquicktime-${version}-${githash}.zip; read dummy; rfpkg new-sources libquicktime-git-${githash}.zip -echo Press enter to continue; read dummy; rfpkg ci -c && git show echo Press enter to continue; read dummy; rfpkg push && rfpkg build --nowait
commit 57af332cbd3b25a568e849c73ad530e8d96832bb Author: Sérgio M. Basto sergio@serjux.com Date: Thu Oct 4 20:33:11 2018 +0100
Mass rebuild for x264 and/or x265
diff --git a/libquicktime.spec b/libquicktime.spec index d173ed5..69dd42d 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 31%{?rel_string}%{?dist} +Release: 32%{?rel_string}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Thu Oct 04 2018 Sérgio Basto sergio@serjux.com - 1.2.4-32.20180202.98.g859a717 +- Mass rebuild for x264 and/or x265 + * Thu Jul 26 2018 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-31.20180202.98.g859a717 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 9334ae4262942a0c1c88d522f8c8a1b78dd79f22 Author: leigh123linux leigh123linux@googlemail.com Date: Fri Jul 27 00:57:11 2018 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: leigh123linux leigh123linux@googlemail.com
diff --git a/libquicktime.spec b/libquicktime.spec index bf13a2f..d173ed5 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 30%{?rel_string}%{?dist} +Release: 31%{?rel_string}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Thu Jul 26 2018 RPM Fusion Release Engineering leigh123linux@gmail.com - 1.2.4-31.20180202.98.g859a717 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 01 2018 RPM Fusion Release Engineering leigh123linux@googlemail.com - 1.2.4-30.20180202.98.g859a717 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 0d44cbfaf54f391f370b692f1fe83832e0ca1885 Author: leigh123linux leigh123linux@googlemail.com Date: Thu Mar 1 08:36:58 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: leigh123linux leigh123linux@googlemail.com
diff --git a/libquicktime.spec b/libquicktime.spec index b340d10..bf13a2f 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,7 +7,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 29%{?rel_string}%{?dist} +Release: 30%{?rel_string}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Thu Mar 01 2018 RPM Fusion Release Engineering leigh123linux@googlemail.com - 1.2.4-30.20180202.98.g859a717 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Feb 03 2018 Sérgio Basto sergio@serjux.com - 1.2.4-29.20180202.98.g859a717 - Update to 1.2.4-98-g859a717 from branch master
commit ad491f2a8db4978349cd739bc8466ff64df8b000 Author: Sérgio M. Basto sergio@serjux.com Date: Sat Feb 3 06:53:28 2018 +0000
Update to 1.2.4-98-g859a717 from branch master
diff --git a/.gitignore b/.gitignore index 10092eb..850df18 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libquicktime-1.2.4.tar.gz /libquicktime-1.2.4-4d451774b8.tar.gz /libquicktime-git-4d451774b89fbdd2f53204f92b71837af7b06761.zip +/libquicktime-git-859a717cef3c624c8e9125b0eaf4d10deb784e98.zip diff --git a/ChangeLog b/ChangeLog index b542036..a8e6142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +commit 859a717cef3c624c8e9125b0eaf4d10deb784e98 +Author: Steven Schultz sms@Stevens-Mac-mini.local +Date: Fri Feb 2 13:03:32 2018 -0600 + + remove m4/avcodec.m4, not needed with changes to configure.ac + +commit 9349111e99620426d1b258e3e3940fc44ccbdf1a +Author: Steven Schultz sms@Stevens-Mac-mini.local +Date: Fri Feb 2 13:01:22 2018 -0600 + + don't need avcodec.m4 with changes to configure.ac + +commit 8b4929f014b7ad83665e292423daeea4224f2526 +Author: Steven Schultz sms@Stevens-Mac-mini.local +Date: Fri Feb 2 12:58:15 2018 -0600 + + cleanup the libavcode and libswscale version checking + +commit 8569de48eaac91aa9edab6e4e411802571e23a05 +Author: Steven Schultz sms@Stevens-Mac-mini.local +Date: Fri Feb 2 12:56:27 2018 -0600 + + since it doesn't compile with modern ffmpeg might as well clean it up + +commit 7992b2f105eeba0ec088cf7c0870d7f957a29608 +Author: Steven Schultz sms@Stevens-Mac-mini.local +Date: Thu Feb 1 10:24:50 2018 -0600 + + libavcodec can not be built due to completely incompatible API. Major version + 54 was the last known version to build with ffmpeg/libavcodec and the current + version is 58. + + Effectively disable libavcodec until someone figures out how to overhaul + libquicktime to build with current ffmpeg/libavcodec + commit 4d451774b89fbdd2f53204f92b71837af7b06761 Author: gmerlin <gmerlin> Date: Tue Sep 26 11:46:13 2017 +0000 diff --git a/libquicktime.spec b/libquicktime.spec index 579685e..b340d10 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,13 +1,13 @@ -%define vers_string 1.2.4-93-g4d45177 -%define rel_string .20170926.93.g4d45177 -%define githash 4d451774b89fbdd2f53204f92b71837af7b06761 +%define vers_string 1.2.4-98-g859a717 +%define rel_string .20180202.98.g859a717 +%define githash 859a717cef3c624c8e9125b0eaf4d10deb784e98 %define shorthash %(c=%{githash}; echo ${c:0:10})
Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 28%{?rel_string}%{?dist} +Release: 29%{?rel_string}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -102,7 +102,8 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; %postun -p /sbin/ldconfig
%files -f %{name}.lang -%doc COPYING README TODO +%license COPYING +%doc README TODO %{_libdir}/%{name}*.so.* %dir %{_libdir}/%{name} %{_libdir}/%{name}/lqt_*.so @@ -129,6 +130,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sat Feb 03 2018 Sérgio Basto sergio@serjux.com - 1.2.4-29.20180202.98.g859a717 +- Update to 1.2.4-98-g859a717 from branch master + * Sun Jan 21 2018 Sérgio Basto sergio@serjux.com - 1.2.4-28.20170926.93.g4d45177 - Update to 1.2.4-93-g4d45177 - Upstream have the official patches for ffmpeg_2.9.patch libav10.patch libquicktime-backport.patch diff --git a/sources b/sources index 73fab2c..e61e18c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9688ebc5bc88fabac0b2e61dc8d6578c libquicktime-git-4d451774b89fbdd2f53204f92b71837af7b06761.zip +55aa87d3e9fdeb15191c765b317b9a98 libquicktime-git-859a717cef3c624c8e9125b0eaf4d10deb784e98.zip diff --git a/update_libquicktime.sh b/update_libquicktime.sh index 556d147..f8618fa 100755 --- a/update_libquicktime.sh +++ b/update_libquicktime.sh @@ -1,8 +1,9 @@ git clone git://github.com/sergiomb2/libquicktime.git version=1.2.4 tag=$version +branch=master pushd libquicktime -git checkout master +git checkout $branch git pull git log $tag..HEAD > ../ChangeLog newdescrib=$(git describe --tags) @@ -17,8 +18,8 @@ sed -i "s|^%define rel_string .*|%define rel_string $relversion|" libquicktime.s sed -i "s|^%define githash .*|%define githash $githash|" libquicktime.spec rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" libquicktime.spec spectool -g libquicktime.spec -echo Press enter to run: rfpkg new-sources libquicktime-${version}-${shorthash}.tar.gz; read dummy; -rfpkg new-sources libquicktime-${version}-${shorthash}.tar.gz +echo Press enter to run: rfpkg new-sources libquicktime-${version}-${githash}.zip; read dummy; +rfpkg new-sources libquicktime-git-${githash}.zip echo Press enter to continue; read dummy; rfpkg ci -c && git show echo Press enter to continue; read dummy;
commit cc6ad034ce5b291281ade81929c1f89e11cc1137 Author: Sérgio M. Basto sergio@serjux.com Date: Wed Jan 24 00:41:53 2018 +0000
Update to official git URL.
diff --git a/.gitignore b/.gitignore index 0578870..10092eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libquicktime-1.2.4.tar.gz /libquicktime-1.2.4-4d451774b8.tar.gz +/libquicktime-git-4d451774b89fbdd2f53204f92b71837af7b06761.zip diff --git a/converttogit.sh b/converttogit.sh index dead042..a361eba 100644 --- a/converttogit.sh +++ b/converttogit.sh @@ -14,3 +14,10 @@ git push -u origin master
and I got this : https://github.com/sergiomb2/libquicktime/commits/master + +and with: +git remote set-url origin ssh://sergiomb@git.code.sf.net/p/libquicktime/git +git push -u origin master + +and we got : +https://sourceforge.net/p/libquicktime/git/ci/master/tree/ diff --git a/libquicktime.spec b/libquicktime.spec index 6f11cc3..579685e 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -11,8 +11,7 @@ Release: 28%{?rel_string}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ -#Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... -Source0: https://github.com/sergiomb2/%%7Bname%7D/archive/%%7Bgithash%7D/%%7Bname%7D-... +Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libquic...
BuildRequires: libdv-devel BuildRequires: libpng-devel libjpeg-devel libGLU-devel @@ -65,7 +64,7 @@ enhancements. This package contains development files for %{name}. # --------------------------------------------------------------------
%prep -%setup -q -n %{name}-%{githash} +%setup -q -n %{name}-git-%{githash}
# --------------------------------------------------------------------
@@ -134,6 +133,7 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; - Update to 1.2.4-93-g4d45177 - Upstream have the official patches for ffmpeg_2.9.patch libav10.patch libquicktime-backport.patch - This release have some security fixes +- Update to official git URL.
* Wed Jan 17 2018 Leigh Scott leigh123linux@googlemail.com - 1.2.4-27 - Rebuilt for ffmpeg-3.5 git diff --git a/sources b/sources index 0b5e84a..73fab2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6d79eb99e6e6e35eead1cdb32cee9ea libquicktime-1.2.4-4d451774b8.tar.gz +9688ebc5bc88fabac0b2e61dc8d6578c libquicktime-git-4d451774b89fbdd2f53204f92b71837af7b06761.zip
commit 8c09fe02a3c512c24da2dbc0ef48e3f2e0dd616f Author: Sérgio M. Basto sergio@serjux.com Date: Sun Jan 21 23:27:20 2018 +0000
Update to 1.2.4-93-g4d45177 Upstream have the official patches for ffmpeg_2.9.patch libav10.patch libquicktime-backport.patch This release have some security fixes
diff --git a/.gitignore b/.gitignore index 8774481..0578870 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libquicktime-1.2.4.tar.gz +/libquicktime-1.2.4-4d451774b8.tar.gz diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..b542036 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,583 @@ +commit 4d451774b89fbdd2f53204f92b71837af7b06761 +Author: gmerlin <gmerlin> +Date: Tue Sep 26 11:46:13 2017 +0000 + + * Support for version 1 of the mdhd atom (patch by Erik Johansson) + +commit f32646eb76a6d2b2768442bd78afb65e7cb5867e +Author: gmerlin <gmerlin> +Date: Tue Jul 18 14:15:30 2017 +0000 + + * Applied udta.patch + +commit bfe392e31eea480d7c4507663395ca483a5abb67 +Author: gmerlin <gmerlin> +Date: Fri Jun 23 13:46:41 2017 +0000 + + * Fixed CVE-2017-9125 + +commit 3a7b5017e5d803dbe82eddd08a2804be3fda0c5d +Author: gmerlin <gmerlin> +Date: Fri Jun 23 13:00:36 2017 +0000 + + * Fixed allocation-failed-in_quicktime_read_ftyp and + allocation-failed-in_quicktime_read_info + +commit bf6e842131fb013a087df6d7c5069a7d3646b199 +Author: gmerlin <gmerlin> +Date: Mon Mar 6 10:16:11 2017 +0000 + + * Fix security hole + +commit 2ea10548de96c3379da6264e6ca21ee3cdc06f0c +Author: gmerlin <gmerlin> +Date: Tue Apr 26 18:04:01 2016 +0000 + + * Security fix + +commit c166ad0b5d00265d6a0a708ed1d39772bfaa8a91 +Author: gmerlin <gmerlin> +Date: Tue Apr 26 17:51:07 2016 +0000 + + * Fix the types of some integer i/o functions (patch by Erik Johansson) + +commit 0b908b27ac3acd25a73f72a25ac1b6ffc86d0567 +Author: gmerlin <gmerlin> +Date: Tue Apr 26 17:47:30 2016 +0000 + + * Fix issue with stps-atom and packetindex (patch by Erik Johansson) + +commit 1698b8b3f46c46a46e5efb856e19ec952b4f8b92 +Author: sms00 <sms00> +Date: Sun Dec 6 18:49:50 2015 +0000 + + Remove unused functions. + +commit 18487486657ba752bf38656509e719b5c5b2c51b +Author: sms00 <sms00> +Date: Sat Dec 5 18:52:43 2015 +0000 + + ffmpeg's neverending api changes - they went AV crazy (again/still). Needed to add AV_ or AV in front of items used from avcodec + +commit 12a6d2878e63d2c602e6f00612450fa8e377f322 +Author: gmerlin <gmerlin> +Date: Wed Oct 21 15:38:33 2015 +0000 + + * Fix Integer over flow in stts.c and quicktime_stsdtable_read_timecode + patch by Erik Johansson + +commit f224f75ee4a33c565ddfb2db82c8ea3d38bbb517 +Author: gmerlin <gmerlin> +Date: Fri Mar 20 10:00:56 2015 +0000 + + * Fix stsd atom termination (patch by Balázs Oroszi) + +commit 3407dafde9dc28b796059f5932b0be097626fd22 +Author: sms00 <sms00> +Date: Fri Mar 6 20:40:23 2015 +0000 + + annotate the new additions for rear surround and matrixed (Prologic) channels + +commit d20fd20cb0f274a0f34371583e745f23021c20f1 +Author: sms00 <sms00> +Date: Fri Mar 6 15:14:09 2015 +0000 + + Add mappings from 'chan atom' to lqt for: rear surround left/right, mono and left/right total (prologic matrix'd) + +commit 531270f7db23760e6ebbd6cab493550b4ca1c7fd +Author: gmerlin <gmerlin> +Date: Tue Feb 3 15:45:59 2015 +0000 + + * Read reserved gmin bits (patch by Derek Chow) + +commit 8e22e547d68b048e2936cdaab792a812e4b53941 +Author: sms00 <sms00> +Date: Mon Nov 3 20:48:22 2014 +0000 + + Prevent crash if audio Decoder doesn't exist - example is 'drms' + [codecs] Warning: Could not find audio Decoder for fourcc drms + for soundtracks in iTunes movies would crash qtinfo. + +commit 28412a2a639b5ff2078f52c253c8c23810a11bbd +Author: sms00 <sms00> +Date: Fri Oct 24 15:14:27 2014 +0000 + + returning 0 from the decode initialization causes lqt_ensure_stream_cmodel_decode to not fill in the color model. + + qtinfo would print "Native colormodel: Undefined" before. Now qtinfo prints + "Native colormodel: YUV 4:2:2 packed (YUY2)" + +commit 54513401b82b6c4dd5f2484420933ff71862e5f2 +Author: gmerlin <gmerlin> +Date: Thu Oct 23 15:12:09 2014 +0000 + + * Fixed stts generation + +commit 06cc79271551b43551d13fa27175ada88461126d +Author: gmerlin <gmerlin> +Date: Thu May 1 22:54:30 2014 +0000 + + * More cleanups + +commit 2a9ca087b733aa4922d110c99b28e5c3c3227798 +Author: gmerlin <gmerlin> +Date: Thu May 1 21:15:34 2014 +0000 + + * Remove quicktime_chunk_to_offset + +commit 5d2cf083a9e2f70b88403984ed9a3ed060c43953 +Author: gmerlin <gmerlin> +Date: Thu May 1 18:58:38 2014 +0000 + + * More cleanups + +commit 7819adf04207d52757237ffec7f87ebb8f6f84a4 +Author: gmerlin <gmerlin> +Date: Thu May 1 18:54:00 2014 +0000 + + * Let the text tracks also use the packet index + * Removed lots of old cruft + +commit e3b9f0fe2691f1bf491c94821e5c92b78d1524ba +Author: gmerlin <gmerlin> +Date: Thu May 1 12:58:16 2014 +0000 + + * Move most video specific functions to video.c + +commit 9cb33b4813cd8fb1743b7a8e00299dfef3df703a +Author: gmerlin <gmerlin> +Date: Thu May 1 12:07:28 2014 +0000 + + * Removed old decode_audio function + +commit 1c63349eeedbfc8de05f71513cb3d729983cdd5a +Author: gmerlin <gmerlin> +Date: Tue Apr 29 22:21:55 2014 +0000 + + * Converted core and all codecs for new Audio demuxing API + +commit 223e3c392d29ac8f59a3d2533ce08cfb85226865 +Author: gmerlin <gmerlin> +Date: Sun Apr 27 22:59:54 2014 +0000 + + * Introduce quicktime_trak_read_packet() + * New codec function: decode_audio_packet() which decodes just one + single packet and leaves buffering and seeking to the core + * Audio seeking is not adapted yet but will be ASAP, so it might not work + ATM + +commit 73b6a91c7f589e0ff67e9861fa24e5b2c3b6d3fe +Author: gmerlin <gmerlin> +Date: Fri Apr 25 21:55:28 2014 +0000 + + * Remove old ffmpeg cruft and increase the minimum lavc version + +commit d92d1917f06e877d46a5a61159d6228e02f92967 +Author: gmerlin <gmerlin> +Date: Wed Apr 23 22:24:04 2014 +0000 + + * New decoding API works somehow + +commit 1a6fbf08be64eca0842095cf7005f475c51e40cb +Author: gmerlin <gmerlin> +Date: Wed Apr 23 20:45:45 2014 +0000 + + * More API conversions + +commit 6e91b8b1cb9255cdefbf5462bc2b6288f4b6b216 +Author: sms00 <sms00> +Date: Wed Apr 23 20:35:32 2014 +0000 + + Accidentally commented AC_LANG_SOURCE(C) out - it causes errors with older + versions of libtool (used on OSX 10.6.8) but other folks perhaps need it. + libquicktime build fine with or without it - not sure why it was added. + +commit 766fd107dbe03cfad9b5d03ea1803802214d0729 +Author: sms00 <sms00> +Date: Wed Apr 23 20:33:04 2014 +0000 + + lqt_packet_index_get_next_display_frame needs to be visible/extern'd on OSX 10.6.8 to avoid and undefined error from lqt_ffmpeg plugin: + qtinfo Disc1.mov + [codecinfo] Error: dlopen failed for /usr/local/lib/libquicktime/lqt_ffmpeg.so: dlopen(/usr/local/lib/libquicktime/lqt_ffmpeg.so, 2): Symbol not found: _lqt_packet_index_get_next_display_frame + Referenced from: /usr/local/lib/libquicktime/lqt_ffmpeg.so + +commit 4ed5f10623b438f959697b03a56ec94a76b25271 +Author: gmerlin <gmerlin> +Date: Wed Apr 23 20:31:17 2014 +0000 + + * Converted more codecs + +commit 4ee0b65979fa2a405727f8ce0f6372c5e3767f91 +Author: gmerlin <gmerlin> +Date: Tue Apr 22 19:14:48 2014 +0000 + + * Convert more codecs for the new API + +commit f12c0601b1fd6edca13cdf2d96987d569dd7682a +Author: gmerlin <gmerlin> +Date: Mon Apr 21 06:39:17 2014 +0000 + + * More updates for the new demuxing API + +commit bd67b98a7d0f7f53a22c8467b765c5e181358ab1 +Author: gmerlin <gmerlin> +Date: Fri Apr 18 12:30:19 2014 +0000 + + * Converted pcm and ima4 + +commit e987e5901de61ef0f0f784eb4fc83c5eeca498b9 +Author: gmerlin <gmerlin> +Date: Fri Apr 18 00:55:12 2014 +0000 + + * Make the pcm codecs use the packet index + +commit d6b9f1c25189302b1fce2e0a69e0a8538b82752b +Author: gmerlin <gmerlin> +Date: Wed Apr 16 22:20:52 2014 +0000 + + * Use new demuxing API for reading video packets + +commit a7e10e7b8a6a16939c2b5f6bd33f010ec42942d7 +Author: gmerlin <gmerlin> +Date: Tue Apr 15 18:46:42 2014 +0000 + + * Export the stsd ID in the packet index + +commit 37553b919395e48b5db643da29667bb094f5dbdc +Author: gmerlin <gmerlin> +Date: Fri Apr 11 22:15:09 2014 +0000 + + * generate packet index for audio tracks also + +commit dfcacedaafb89817fde58f48e4e44890274e0778 +Author: gmerlin <gmerlin> +Date: Sun Apr 6 22:35:50 2014 +0000 + + * Generate the packet index for Quicktime and AVI video streams + +commit 2ef27c3d2bfaf642622734176e25a005a20a92d1 +Author: gmerlin <gmerlin> +Date: Tue Apr 1 19:57:30 2014 +0000 + + * Introduce a runtime generated packet index for more efficient + demultiplexing + +commit 0c25e15dc829e69c9f9eb406f856ec0721dd6aaa +Author: gmerlin <gmerlin> +Date: Tue Mar 25 16:57:33 2014 +0000 + + * Update + +commit edb79560e0d5c895e23ea048a8444b521a039547 +Author: gmerlin <gmerlin> +Date: Fri Mar 21 13:30:41 2014 +0000 + + * Initialize tcmi flags to zero as recommended + +commit fee30f795236298e8c9548e09da99c3fd7c446de +Author: gmerlin <gmerlin> +Date: Fri Mar 21 11:58:28 2014 +0000 + + * Skip null blocks patch by Erik Johansson + +commit f4a7b6aded4f44bf6d9896a5e5df4d1a2c875e29 +Author: gmerlin <gmerlin> +Date: Mon Dec 9 16:03:40 2013 +0000 + + * Better price calculation for colormodel conversions + (patch by Erik Johansson) + +commit 0ce3b70a3858eac940aae4e47b1ea3a0e5f8c237 +Author: gmerlin <gmerlin> +Date: Fri Dec 6 15:59:34 2013 +0000 + + * yuvj420 -> yuvj422 Conversion patch by Erik Johansson + +commit 78f4862934b495e7bbaf8452ec247630a6f2bf89 +Author: gmerlin <gmerlin> +Date: Wed Nov 27 17:15:31 2013 +0000 + + * Flush more delayed frames (patch by Erik Johansson) + +commit 0bede77253913493c52b76a1e3d793ce92130326 +Author: gmerlin <gmerlin> +Date: Wed Nov 27 17:09:30 2013 +0000 + + * Mingw fixes for utf-8 and 64 bit stat (patch by Derek Chow) + +commit 4773c54f5de8ab896cf329d160ec5f6476e37f37 +Author: gmerlin <gmerlin> +Date: Thu Nov 21 15:10:54 2013 +0000 + + * More mingw patches by Derek Chow + +commit b292819f366e0446afcb3c2428590acfd63616fe +Author: gmerlin <gmerlin> +Date: Tue Nov 19 16:46:23 2013 +0000 + + * mingw patch by Derek Chow + +commit 8b73d511668e71c3c1f6c57f629df556593b7fd1 +Author: gmerlin <gmerlin> +Date: Tue Oct 29 08:57:05 2013 +0000 + + * Set LDFLAGS for modules in configure.ac + * Fix some crashes (patch by Paul J. Taggart) + +commit 400e1e4e03f79bd2bf362ecf7fdd133d5075968f +Author: sms00 <sms00> +Date: Tue Oct 29 03:02:17 2013 +0000 + + Older versions of autoconf (2.61) sometimes need [] around the 'else' in AC_CHECK_FUNCS to avoid an error + ./configure: line 24695: syntax error: unexpected end of file + +commit f317d4ce065a61a95c28f70765fa4f740d875867 +Author: gmerlin <gmerlin> +Date: Mon Oct 7 14:38:02 2013 +0000 + + * Add -no-undefined to libtool flags + * Simplified *localtime* ifdefs + +commit 6dd6c14f7eac41b62f4fb6a7ad64ac435828f968 +Author: gmerlin <gmerlin> +Date: Fri Sep 27 13:46:43 2013 +0000 + + * mingw patches by Derek Chow + +commit 2afeae7edc5d45c6b835fa5bcf7b821b5c72b212 +Author: gmerlin <gmerlin> +Date: Fri Sep 27 13:23:39 2013 +0000 + + * bzero, bcopy -> memset, memcpy + +commit 3d30c039370c7d9893b2990e006641f6daea565a +Author: gmerlin <gmerlin> +Date: Fri Jun 7 14:36:20 2013 +0000 + + * Prores codec name patch by Boris Maksalov + +commit 823d5938a5bd0996882ea467ab25015f79958540 +Author: gmerlin <gmerlin> +Date: Wed Jun 5 15:10:48 2013 +0000 + + * Another API update patch by Erik Johansson + +commit ac79fc2ee5361bbb49a6fb337d0f23e02fdf7fdf +Author: gmerlin <gmerlin> +Date: Tue May 21 13:49:26 2013 +0000 + + * AVPacket handling patch by Joseph Artsimovich + +commit 220a1bd3cf1502fdb755be3a3771575f484b3e8b +Author: gmerlin <gmerlin> +Date: Tue May 21 13:42:20 2013 +0000 + + * 8 bit sowt seems to be signed + +commit 8d832fabb420fc42edacd914a560943ae9f069ba +Author: gmerlin <gmerlin> +Date: Tue May 7 09:30:01 2013 +0000 + + * Fix potential crash + +commit f23facd94acd3ff0c3be4efd6de82f69dd44fe87 +Author: gmerlin <gmerlin> +Date: Tue May 7 09:18:51 2013 +0000 + + * Latest ffmpeg patch by Joseph Artsimovich + +commit ab32b84dd1e6e5b100d22aeeffbafe67e02edb31 +Author: gmerlin <gmerlin> +Date: Mon Apr 29 08:30:54 2013 +0000 + + * Prime sample support patch by Erik Johansson + +commit eb0458dd42f28b094e2a4695758865109fb73669 +Author: gmerlin <gmerlin> +Date: Tue Apr 23 15:11:53 2013 +0000 + + * avid imx fix by Joseph Artsimovich + +commit 0b8adf13d39b8ba3717a6e8c86d6d59f3d68f711 +Author: gmerlin <gmerlin> +Date: Tue Apr 23 15:11:05 2013 +0000 + + * autotools fix proposed by Christian Ebert + +commit 44662bf4f5e1364140f08b26126f097986475435 +Author: sms00 <sms00> +Date: Sun Apr 21 21:54:58 2013 +0000 + + ffmpeg/libavcodec breakage again/still - define AVCODEC_MAX_AUDIO_FRAME_SIZE + using value from libavcodec/avcodec.h dated Dec 23 2012 + +commit 2158ea2e436cc5d635215078e6bcd7ec8aa7872c +Author: gmerlin <gmerlin> +Date: Fri Apr 19 16:59:59 2013 +0000 + + * Add avid IMX fourccs (patch by Joseph Artsimovich) + +commit 55f5d4523a96cdf2a45a3af81b8d251337c5d020 +Author: gmerlin <gmerlin> +Date: Tue Mar 19 10:29:58 2013 +0000 + + * libpng16 support patch by pgajdos [at] suse.cz + +commit 25ebfb6ae1a88586469d7524a82093ead13a3043 +Author: gmerlin <gmerlin> +Date: Tue Feb 12 17:34:23 2013 +0000 + + * Fix qmax for imx30 (patch by Joseph Artsimovich) + +commit d001f6e756cd9134b878d870686241fb4bddf4e9 +Author: gmerlin <gmerlin> +Date: Tue Feb 12 17:32:53 2013 +0000 + + * Better handling of broken frames (patch by Joseph Artsimovich) + +commit d0388b8915dd34fb3cb2e76978b1d9df6a5dc436 +Author: stscheff <stscheff> +Date: Sat Jan 12 13:02:30 2013 +0000 + + force movie timescale to qtvr timescale + +commit b31b4db0497e37aa07320022a71ea2544ea24b44 +Author: gmerlin <gmerlin> +Date: Fri Dec 21 13:37:09 2012 +0000 + + * Compatibility patch + +commit a63f3af8467bbd4fc6bb6384d0ca5902c2c46411 +Author: gmerlin <gmerlin> +Date: Tue Nov 27 15:52:47 2012 +0000 + + * Change vendor back to appl to work around broken decoders + +commit 812fb9a441592915a416dde10bf559b7162f4f51 +Author: gmerlin <gmerlin> +Date: Tue Nov 27 15:46:40 2012 +0000 + + * Fix pts handling for some codecs, which rely on a constant framerate + +commit b4691242da7909b3643e50c78dc03317a2c9c1ef +Author: gmerlin <gmerlin> +Date: Tue Nov 20 09:51:21 2012 +0000 + + * Forgot this file + +commit 3df140a62c0ea17307ea83b5fdae454d3df95ed5 +Author: gmerlin <gmerlin> +Date: Mon Nov 19 16:59:29 2012 +0000 + + * sdtp support patch by Joseph Artsimovich + +commit 1436e47438e8d4c40ade2fc1b98eddfef6f1e452 +Author: gmerlin <gmerlin> +Date: Mon Nov 19 16:50:48 2012 +0000 + + * uninitialized read patch by Joseph Artsimovich + * Updated schroedinger settings extraction + +commit b68705b23f206513220c625fc2b35241c6e62d9f +Author: gmerlin <gmerlin> +Date: Fri Nov 9 10:24:12 2012 +0000 + + * Let the codec initialization know if we are en- or decoding + (patch by Joseph Artsimovich) + +commit dbf163d577d78f974356ab2cad33fdf9ac3eaae6 +Author: gmerlin <gmerlin> +Date: Thu Nov 8 12:53:45 2012 +0000 + + * Fixed YUV10 to RGB888 conversion + +commit 6bb0b58264504ace379917be456f348f287dbaf1 +Author: gmerlin <gmerlin> +Date: Tue Nov 6 11:07:01 2012 +0000 + + * Use codec specific defaults + +commit bdacab2a502311ac858923a54347af727af3f07f +Author: gmerlin <gmerlin> +Date: Mon Oct 8 18:50:15 2012 +0000 + + * Fix crash + +commit a5a04a249493c2cb44c18024e84f5dcce73fb910 +Author: gmerlin <gmerlin> +Date: Mon Sep 24 09:17:25 2012 +0000 + + * Gop size patch by Joseph Artsimovich + +commit d5aad041e938f4484a7e5d034043834569e2545c +Author: gmerlin <gmerlin> +Date: Fri Sep 14 21:12:57 2012 +0000 + + * Simplify seeking and consider B-frames used as references + +commit 06ff9b12330b77e8aad95da5d0b4997d3eb1823f +Author: gmerlin <gmerlin> +Date: Tue Aug 7 17:36:11 2012 +0000 + + * ProRes support patch by Boris Maksalov + +commit 4d45f43a2ea5c598be9b700789b9f03fc88db806 +Author: gmerlin <gmerlin> +Date: Thu Jun 28 14:30:21 2012 +0000 + + * Support thread_count for more ffmpeg codecs (patch by Joseph Artsimovich) + +commit b9f7bf8f201208abe7c992370b19e1659246e862 +Author: gmerlin <gmerlin> +Date: Thu Jun 28 14:28:40 2012 +0000 + + * Delay the colormodel detection such that it happens after setting the + parameters + +commit a6dfc1c04cc6a9236613a26c1b9e21bbbc385af3 +Author: gmerlin <gmerlin> +Date: Tue Jun 12 16:30:57 2012 +0000 + + * Works also for mp4 + +commit adb2dc5b7305d0dfc9a65ea0d8fc4d914f2afac7 +Author: gmerlin <gmerlin> +Date: Tue Jun 12 16:27:58 2012 +0000 + + * Unified seeking patch by Joseph Artsimovich + +commit cdb2262a36c518b7b1d10b8a4c50e6e3a8131a92 +Author: gmerlin <gmerlin> +Date: Fri Jun 8 13:56:39 2012 +0000 + + * stps support by Joseph Artsimovich + +commit 962af75c8bae8493fd5f8aef3afac041c907b041 +Author: gmerlin <gmerlin> +Date: Fri Jun 8 13:56:13 2012 +0000 + + * stps and xdcam support patch by Joseph Artsimovich + +commit 7fac464e1d9220ace2a3f93d4cee3108cd62a0eb +Author: gmerlin <gmerlin> +Date: Fri Jun 8 12:25:42 2012 +0000 + + * Reverted last patch + +commit 59838700eec97a2e07d124b06be80b3c5b09001f +Author: gmerlin <gmerlin> +Date: Fri Jun 8 12:12:47 2012 +0000 + + * stps support patch by Joseph Artsimovich + +commit f36768d87314b85c7e84e6b8bfcdf6a6bedfd77c +Author: gmerlin <gmerlin> +Date: Thu May 24 16:01:13 2012 +0000 + + * Speed up seeking in long GOP video (patch by Joseph Artsimovich) + +commit e6294ee27c9a616f5ea8ce5b5778f0c3e77d258d +Author: gmerlin <gmerlin> +Date: Fri Apr 27 15:19:52 2012 +0000 + + * Get rid of PATH_MAX in the library diff --git a/converttogit.sh b/converttogit.sh new file mode 100644 index 0000000..dead042 --- /dev/null +++ b/converttogit.sh @@ -0,0 +1,16 @@ + + +cvs -d:pserver:anonymous@libquicktime.cvs.sourceforge.net:/cvsroot/libquicktime login +cvs -z3 -d:pserver:anonymous@libquicktime.cvs.sourceforge.net:/cvsroot/libquicktime co -P libquicktime +cd libquicktime +git cvsimport -v + +In github.com press + and new repository, choose repository name: libquicktime +without "Initialize this repository with a README" . +and run: + +git remote add origin git@github.com:sergiomb2/libquicktime.git +git push -u origin master + +and I got this : +https://github.com/sergiomb2/libquicktime/commits/master diff --git a/ffmpeg_2.9.patch b/ffmpeg_2.9.patch deleted file mode 100644 index cefc7fe..0000000 --- a/ffmpeg_2.9.patch +++ /dev/null @@ -1,351 +0,0 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun Andreas.Cadhalpun@googlemail.com -Last-Update: <2015-11-02> - ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -1267,7 +1267,7 @@ static int lqt_ffmpeg_encode_audio(quick - pkt.data = codec->chunk_buffer; - pkt.size = codec->chunk_buffer_alloc; - -- avcodec_get_frame_defaults(&f); -+ av_frame_unref(&f); - f.nb_samples = codec->avctx->frame_size; - - avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -158,7 +158,6 @@ enum_t coder_type[] = - { "Arithmetic", FF_CODER_TYPE_AC }, - { "Raw", FF_CODER_TYPE_RAW }, - { "RLE", FF_CODER_TYPE_RLE }, -- { "Deflate", FF_CODER_TYPE_DEFLATE }, - }; - - #define PARAM_ENUM(name, var, arr) \ -@@ -253,15 +252,13 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation); - PARAM_INT("ff_bidir_refine",bidir_refine); - PARAM_INT("ff_brd_scale",brd_scale); -- PARAM_INT("ff_scenechange_factor",scenechange_factor); - PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE); - PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV); - PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL); -- PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC); -+ PARAM_DICT_FLAG("ff_flag_gmc", "gmc"); - PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0); - // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused - PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY); -- PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE); - PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP); - // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h -+++ libquicktime-1.2.4/plugins/ffmpeg/params.h -@@ -149,7 +149,7 @@ the reference. Unused for constant quant - .type = LQT_PARAMETER_INT, \ - .val_default = { .val_int = 0 }, \ - .val_min = { .val_int = 0 }, \ -- .val_max = { .val_int = FF_MAX_B_FRAMES }, \ -+ .val_max = { .val_int = INT_MAX }, \ - .help_string = TRS("Maximum number of B-frames between non B-frames") \ - } - ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -37,10 +37,10 @@ - #endif - - --#ifdef PIX_FMT_YUV422P10 --#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 -+#ifdef AV_PIX_FMT_YUV422P10 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 - #else --#define PIX_FMT_YUV422P10_OR_DUMMY -1234 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 - #endif - - #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) -@@ -90,9 +90,9 @@ typedef struct - int imx_bitrate; - int imx_strip_vbi; - -- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while -- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ -- enum PixelFormat reinterpret_pix_fmt; -+ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while -+ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ -+ enum AVPixelFormat reinterpret_pix_fmt; - - int is_imx; - int y_offset; -@@ -137,42 +137,42 @@ typedef struct - - static const struct - { -- enum PixelFormat ffmpeg_id; -+ enum AVPixelFormat ffmpeg_id; - int lqt_id; - int exact; - } - colormodels[] = - { -- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) -+ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_YUV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, - #else -- { PIX_FMT_YUYV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, - #endif -- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) --#ifdef PIX_FMT_YUV422P10 -- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 --#endif -- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) -+ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -+ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -+ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -+ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -+ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+#ifdef AV_PIX_FMT_YUV422P10 -+ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 -+#endif -+ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -+ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #else -- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #endif -- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -- { PIX_FMT_GRAY8, BC_RGB888, 0 }, -- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) -+ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -+ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, -+ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -+ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -+ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -+ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) - }; - - static const struct -@@ -248,7 +248,7 @@ static int lqt_ffmpeg_delete_video(quick - if(codec->frame_buffer) free(codec->frame_buffer); - if(codec->buffer) free(codec->buffer); - -- if(codec->frame) av_free(codec->frame); -+ if(codec->frame) av_frame_free(&codec->frame); - - #ifdef HAVE_LIBSWSCALE - if(codec->swsContext) -@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV - if (!codec->pix_fmts) - return 0; - -- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) -+ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) - { -- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) -+ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) - return 1; - } - - return 0; - } - --static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) -+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) - { - int i; - -@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f - if(colormodels[i].lqt_id == id) - return colormodels[i].ffmpeg_id; - } -- return PIX_FMT_NB; -+ return AV_PIX_FMT_NB; - } - --static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) -+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) - { - int i; - -@@ -405,31 +405,31 @@ static void lqt_ffmpeg_setup_decoding_co - if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) - { - vtrack->stream_cmodel = BC_YUVJ422P; -- codec->reinterpret_pix_fmt = PIX_FMT_YUVJ422P; -+ codec->reinterpret_pix_fmt = AV_PIX_FMT_YUVJ422P; - *exact = 1; - return; - } - } - else if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which -- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) -+ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which -+ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -+ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) - { -- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); -+ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); - *exact = 1; - if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) - { - vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; -- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; -+ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except - // there is no such colormodel in FFMpeg. Fortunately, it's not a problem - // in this case, as reinterpret_pix_fmt is only used when *exact == 0. - } - else - { - vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; - } - return; - } -@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co - - if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 -- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 -+ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 -+ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 - (in fact, the latter doesn't even exist) */ -- codec->avctx->pix_fmt = PIX_FMT_YUV422P; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; - if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) - { - if (lqt_tenbit_dnxhd_supported(codec->encoder)) -- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; - } - } - } -@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co - /* From avcodec.h: */ - - /* -- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA -+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA - * color is put together as: - * (A << 24) | (R << 16) | (G << 8) | B - * This is stored as BGRA on little endian CPU architectures and ARGB on -@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t - */ - - static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, -- AVFrame * in_frame, enum PixelFormat in_format, -+ AVFrame * in_frame, enum AVPixelFormat in_format, - unsigned char ** out_frame, int out_format, - int width, int height, int row_span, int row_span_uv) - { -@@ -547,9 +547,9 @@ static void convert_image_decode(quickti - * RGBA format like in ffmpeg?? - */ - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) - #else -- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) - #endif - { - convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); -@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick - if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) - return -1; - #endif -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - vtrack->stream_cmodel = LQT_COLORMODEL_NONE; - codec->initialized = 1; - } -@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick - #ifdef HAVE_LIBSWSCALE - - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #else -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #endif - { -@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick - - if(!codec->initialized) - { -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - - /* time_base is 1/framerate for constant framerate */ - -@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick - if(vtrack->stream_cmodel == BC_RGBA8888) - { - /* Libquicktime doesn't natively support a color model equivalent -- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. -+ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. - So, we use BC_RGBA8888 and do ad hoc conversion below. */ -- codec->avctx->pix_fmt = PIX_FMT_ARGB; -+ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick - } - // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); - -- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - if(!codec->tmp_rows) - { -@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick - vtrack->stream_cmodel, - 0, 0, 0, codec->y_offset); - } -- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, - codec->tmp_rows[0], codec->tmp_row_span, -@@ -1600,7 +1600,7 @@ static int lqt_ffmpeg_encode_video(quick - { - int advanced = 0; - if(codec->avctx->max_b_frames || -- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) -+ (codec->avctx->flags & (AV_CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) - advanced = 1; - - setup_header_mpeg4(file, track, codec->avctx->extradata, diff --git a/libav10.patch b/libav10.patch deleted file mode 100644 index cb85a55..0000000 --- a/libav10.patch +++ /dev/null @@ -1,654 +0,0 @@ -Description: build against libav10 (Closes: #739325) -Author: Reinhard Tartler siretart@tauware.de -Bug-Debian: http://bugs.debian.org/739325 -Last-Update: 2014-03-16 - - ---- libquicktime-1.2.4.orig/plugins/ffmpeg/lqt_ffmpeg.c -+++ libquicktime-1.2.4/plugins/ffmpeg/lqt_ffmpeg.c -@@ -386,7 +386,7 @@ static lqt_image_size_static_t image_siz - struct CODECIDMAP codecidmap_v[] = - { - { -- .id = CODEC_ID_MPEG1VIDEO, -+ .id = AV_CODEC_ID_MPEG1VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -397,7 +397,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE } - }, - { -- .id = CODEC_ID_MPEG4, -+ .id = AV_CODEC_ID_MPEG4, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -415,7 +415,7 @@ struct CODECIDMAP codecidmap_v[] = - .compression_id = LQT_COMPRESSION_MPEG4_ASP, - }, - { -- .id = CODEC_ID_MSMPEG4V1, -+ .id = AV_CODEC_ID_MSMPEG4V1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -426,7 +426,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V2, -+ .id = AV_CODEC_ID_MSMPEG4V2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -437,7 +437,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -453,7 +453,7 @@ struct CODECIDMAP codecidmap_v[] = - .do_encode = 1, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -468,7 +468,7 @@ struct CODECIDMAP codecidmap_v[] = - }, - #if 0 - { -- .id = CODEC_ID_WMV1, -+ .id = AV_CODEC_ID_WMV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -481,7 +481,7 @@ struct CODECIDMAP codecidmap_v[] = - }, - #endif - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -493,7 +493,7 @@ struct CODECIDMAP codecidmap_v[] = - .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP, - }, - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -508,7 +508,7 @@ struct CODECIDMAP codecidmap_v[] = - .do_encode = 1, - }, - { -- .id = CODEC_ID_H264, -+ .id = AV_CODEC_ID_H264, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -519,7 +519,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_H263P, -+ .id = AV_CODEC_ID_H263P, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -533,7 +533,7 @@ struct CODECIDMAP codecidmap_v[] = - .do_encode = 1, - }, - { -- .id = CODEC_ID_H263I, -+ .id = AV_CODEC_ID_H263I, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -544,7 +544,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ1, -+ .id = AV_CODEC_ID_SVQ1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -555,7 +555,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ3, -+ .id = AV_CODEC_ID_SVQ3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -566,7 +566,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MJPEG, -+ .id = AV_CODEC_ID_MJPEG, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -580,7 +580,7 @@ struct CODECIDMAP codecidmap_v[] = - .do_encode = 1, - }, - { -- .id = CODEC_ID_MJPEGB, -+ .id = AV_CODEC_ID_MJPEGB, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -594,7 +594,7 @@ struct CODECIDMAP codecidmap_v[] = - }, - #if LIBAVCODEC_BUILD >= 3346688 - { -- .id = CODEC_ID_TARGA, -+ .id = AV_CODEC_ID_TARGA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -606,7 +606,7 @@ struct CODECIDMAP codecidmap_v[] = - #endif - #if LIBAVCODEC_BUILD >= 3347456 - { -- .id = CODEC_ID_TIFF, -+ .id = AV_CODEC_ID_TIFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -617,7 +617,7 @@ struct CODECIDMAP codecidmap_v[] = - }, - #endif - { -- .id = CODEC_ID_8BPS, -+ .id = AV_CODEC_ID_8BPS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -627,7 +627,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_INDEO3, -+ .id = AV_CODEC_ID_INDEO3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -638,7 +638,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_RPZA, -+ .id = AV_CODEC_ID_RPZA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -648,7 +648,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SMC, -+ .id = AV_CODEC_ID_SMC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -658,7 +658,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CINEPAK, -+ .id = AV_CODEC_ID_CINEPAK, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -669,7 +669,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CYUV, -+ .id = AV_CODEC_ID_CYUV, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -680,7 +680,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_QTRLE, -+ .id = AV_CODEC_ID_QTRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -693,7 +693,7 @@ struct CODECIDMAP codecidmap_v[] = - .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE }, - }, - { -- .id = CODEC_ID_MSRLE, -+ .id = AV_CODEC_ID_MSRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -703,7 +703,7 @@ struct CODECIDMAP codecidmap_v[] = - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -719,7 +719,7 @@ struct CODECIDMAP codecidmap_v[] = - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -735,7 +735,7 @@ struct CODECIDMAP codecidmap_v[] = - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -751,7 +751,7 @@ struct CODECIDMAP codecidmap_v[] = - }, - /* DVCPRO HD (decoding only for now) */ - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -772,7 +772,7 @@ struct CODECIDMAP codecidmap_v[] = - // .do_encode = 1 - }, - { -- .id = CODEC_ID_FFVHUFF, -+ .id = AV_CODEC_ID_FFVHUFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -785,7 +785,7 @@ struct CODECIDMAP codecidmap_v[] = - .do_encode = 1 - }, - { -- .id = CODEC_ID_FFV1, -+ .id = AV_CODEC_ID_FFV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -801,7 +801,7 @@ struct CODECIDMAP codecidmap_v[] = - }, - #if LIBAVCODEC_BUILD >= 3352576 - { -- .id = CODEC_ID_DNXHD, -+ .id = AV_CODEC_ID_DNXHD, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -817,7 +817,7 @@ struct CODECIDMAP codecidmap_v[] = - }, - #endif - { -- .id = CODEC_ID_MPEG2VIDEO, -+ .id = AV_CODEC_ID_MPEG2VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -839,7 +839,7 @@ struct CODECIDMAP codecidmap_v[] = - struct CODECIDMAP codecidmap_a[] = - { - { -- .id = CODEC_ID_MP3, -+ .id = AV_CODEC_ID_MP3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -851,7 +851,7 @@ struct CODECIDMAP codecidmap_a[] = - .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MP2, -+ .id = AV_CODEC_ID_MP2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -866,7 +866,7 @@ struct CODECIDMAP codecidmap_a[] = - .compression_id = LQT_COMPRESSION_MP2, - }, - { -- .id = CODEC_ID_AC3, -+ .id = AV_CODEC_ID_AC3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -881,7 +881,7 @@ struct CODECIDMAP codecidmap_a[] = - .compression_id = LQT_COMPRESSION_AC3, - }, - { -- .id = CODEC_ID_QDM2, -+ .id = AV_CODEC_ID_QDM2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -896,7 +896,7 @@ struct CODECIDMAP codecidmap_a[] = - #if 1 - /* Doesn't work as long as audio chunks are not split into VBR "Samples" */ - { -- .id = CODEC_ID_ALAC, -+ .id = AV_CODEC_ID_ALAC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -909,7 +909,7 @@ struct CODECIDMAP codecidmap_a[] = - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_MS, -+ .id = AV_CODEC_ID_ADPCM_MS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -922,7 +922,7 @@ struct CODECIDMAP codecidmap_a[] = - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_IMA_WAV, -+ .id = AV_CODEC_ID_ADPCM_IMA_WAV, - .index = -1, - .encoder = NULL, - .decoder = NULL, ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -626,7 +632,7 @@ static int decode_chunk(quicktime_t * fi - { - /* If the codec is mp3, make sure to decode the very last frame */ - -- if((codec->avctx->codec_id == CODEC_ID_MP3) && -+ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) && - (codec->bytes_in_chunk_buffer >= 4)) - { - if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0)) -@@ -695,7 +701,7 @@ static int decode_chunk(quicktime_t * fi - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ - -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - if(codec->bytes_in_chunk_buffer < 4) - { -@@ -806,7 +812,7 @@ static int decode_chunk(quicktime_t * fi - - if(bytes_decoded < 0) - { -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - /* For mp3, bytes_decoded < 0 means, that the frame should be muted */ - memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end - -@@ -866,8 +872,8 @@ static void init_compression_info(quickt - quicktime_audio_map_t *track_map = &file->atracks[track]; - quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv; - -- if((codec->decoder->id == CODEC_ID_MP2) || -- (codec->decoder->id == CODEC_ID_MP3)) -+ if((codec->decoder->id == AV_CODEC_ID_MP2) || -+ (codec->decoder->id == AV_CODEC_ID_MP3)) - { - mpa_header h; - uint32_t header; -@@ -909,7 +915,7 @@ static void init_compression_info(quickt - else - track_map->ci.bitrate = h.bitrate; - } -- else if(codec->decoder->id == CODEC_ID_AC3) -+ else if(codec->decoder->id == AV_CODEC_ID_AC3) - { - a52_header h; - uint8_t * ptr; -@@ -986,7 +992,7 @@ static int lqt_ffmpeg_decode_audio(quick - #endif - /* Some codecs need extra stuff */ - -- if(codec->decoder->id == CODEC_ID_ALAC) -+ if(codec->decoder->id == AV_CODEC_ID_ALAC) - { - header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); - if(header) -@@ -995,7 +1001,7 @@ static int lqt_ffmpeg_decode_audio(quick - codec->avctx->extradata_size = header_len; - } - } -- if(codec->decoder->id == CODEC_ID_QDM2) -+ if(codec->decoder->id == AV_CODEC_ID_QDM2) - { - header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); - if(header) -@@ -1495,9 +1501,9 @@ void quicktime_init_audio_codec_ffmpeg(q - codec_base->decode_audio = lqt_ffmpeg_decode_audio; - codec_base->set_parameter = set_parameter; - -- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) -+ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) - codec_base->read_packet = read_packet_mpa; -- else if(decoder->id == CODEC_ID_AC3) -+ else if(decoder->id == AV_CODEC_ID_AC3) - { - codec_base->write_packet = write_packet_ac3; - codec_base->read_packet = read_packet_ac3; ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -400,7 +400,7 @@ static void lqt_ffmpeg_setup_decoding_co - return; - } - } -- else if(codec->decoder->id == CODEC_ID_DNXHD) -+ else if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which - we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -@@ -438,7 +438,7 @@ static void lqt_ffmpeg_setup_encoding_co - quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; - codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); - -- if (codec->encoder->id == CODEC_ID_DNXHD) -+ if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 - and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 -@@ -728,13 +728,13 @@ static int lqt_ffmpeg_decode_video(quick - - /* Set extradata: It's done differently for each codec */ - -- if(codec->decoder->id == CODEC_ID_SVQ3) -+ if(codec->decoder->id == AV_CODEC_ID_SVQ3) - { - extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; - extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; - - } -- else if(codec->decoder->id == CODEC_ID_H264) -+ else if(codec->decoder->id == AV_CODEC_ID_H264) - { - user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); - -@@ -753,7 +753,7 @@ static int lqt_ffmpeg_decode_video(quick - } - - } -- else if(codec->decoder->id == CODEC_ID_MPEG4) -+ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) - { - if(trak->mdia.minf.stbl.stsd.table[0].has_esds) - { -@@ -947,15 +947,15 @@ static int lqt_ffmpeg_decode_video(quick - } - #endif - } -- if(codec->decoder->id == CODEC_ID_DVVIDEO) -+ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; - vtrack->ci.id = LQT_COMPRESSION_DV; - } -- else if((codec->decoder->id == CODEC_ID_MPEG4) || -- (codec->decoder->id == CODEC_ID_H264)) -+ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || -+ (codec->decoder->id == AV_CODEC_ID_H264)) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; -@@ -1299,13 +1299,13 @@ static int lqt_ffmpeg_encode_video(quick - { - if(vtrack->stream_cmodel == BC_YUV420P) - { -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; - /* enable interlaced encoding */ - vtrack->interlace_mode = LQT_INTERLACE_NONE; - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - } -@@ -1340,7 +1340,7 @@ static int lqt_ffmpeg_encode_video(quick - codec->avctx->sample_aspect_ratio.num = pixel_width; - codec->avctx->sample_aspect_ratio.den = pixel_height; - /* Use global headers for mp4v */ -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1364,12 +1364,12 @@ static int lqt_ffmpeg_encode_video(quick - } - #endif - } -- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && -+ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && - !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) - { - strncpy(trak->strl->strh.fccHandler, "div3", 4); - } -- else if((codec->encoder->id == CODEC_ID_H263) && -+ else if((codec->encoder->id == AV_CODEC_ID_H263) && - (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) - { - uint8_t d263_data[] = -@@ -1383,7 +1383,7 @@ static int lqt_ffmpeg_encode_video(quick - strncpy(trak->mdia.minf.stbl.stsd.table[0].format, - "s263", 4); - } -- else if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1391,7 +1391,7 @@ static int lqt_ffmpeg_encode_video(quick - codec->write_global_header = 1; - } - } -- else if(codec->encoder->id == CODEC_ID_QTRLE) -+ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) - { - if(vtrack->stream_cmodel == BC_RGBA8888) - { -@@ -1402,11 +1402,11 @@ static int lqt_ffmpeg_encode_video(quick - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); - } -- else if(codec->encoder->id == CODEC_ID_DNXHD) -+ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -@@ -1558,12 +1558,12 @@ static int lqt_ffmpeg_encode_video(quick - - #endif - -- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) -+ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) - setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); - - if(bytes_encoded) - { -- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) -+ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) - { - /* Some codecs don't bother generating presentation timestamps. - FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ -@@ -1590,13 +1590,13 @@ static int lqt_ffmpeg_encode_video(quick - - if(codec->write_global_header && !codec->global_header_written) - { -- if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, - "glbl", - codec->avctx->extradata, codec->avctx->extradata_size ); - } -- else if(codec->encoder->id == CODEC_ID_MPEG4) -+ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; - if(codec->avctx->max_b_frames || -@@ -1903,18 +1903,18 @@ void quicktime_init_video_codec_ffmpeg(q - codec_base->encode_video = lqt_ffmpeg_encode_video; - codec_base->set_pass = set_pass_ffmpeg; - -- if(encoder->id == CODEC_ID_MPEG4) -+ if(encoder->id == AV_CODEC_ID_MPEG4) - { - codec_base->writes_compressed = writes_compressed_mpeg4; - codec_base->init_compressed = init_compressed_mpeg4; - codec_base->write_packet = write_packet_mpeg4; - } -- else if(encoder->id == CODEC_ID_MPEG2VIDEO) -+ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) - { - codec_base->writes_compressed = writes_compressed_imx; - codec_base->init_compressed = init_compressed_imx; - } -- else if(encoder->id == CODEC_ID_DVVIDEO) -+ else if(encoder->id == AV_CODEC_ID_DVVIDEO) - { - codec_base->init_compressed = init_compressed_dv; - } -@@ -1922,7 +1922,7 @@ void quicktime_init_video_codec_ffmpeg(q - } - if(decoder) - { -- if(decoder->id == CODEC_ID_H264) -+ if(decoder->id == AV_CODEC_ID_H264) - codec_base->read_packet = read_packet_h264; - codec_base->decode_video = lqt_ffmpeg_decode_video; - } diff --git a/libquicktime-backport.patch b/libquicktime-backport.patch deleted file mode 100644 index 14253da..0000000 --- a/libquicktime-backport.patch +++ /dev/null @@ -1,250 +0,0 @@ -diff -up libquicktime-1.2.4/plugins/ffmpeg/audio.c.backport libquicktime-1.2.4/plugins/ffmpeg/audio.c ---- libquicktime-1.2.4/plugins/ffmpeg/audio.c.backport 2012-03-29 21:44:28.000000000 +0200 -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c 2013-08-26 12:14:47.099995207 +0200 -@@ -45,6 +45,11 @@ - #define ENCODE_AUDIO 1 - #endif - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+/* from libavcodec/avcodec.h dated Dec 23 2012 */ -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#endif -+ - /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ - - /* MPEG Audio header parsing code */ -diff -up libquicktime-1.2.4/plugins/ffmpeg/params.c.backport libquicktime-1.2.4/plugins/ffmpeg/params.c ---- libquicktime-1.2.4/plugins/ffmpeg/params.c.backport 2012-03-07 15:10:41.000000000 +0100 -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c 2013-08-26 12:14:47.098995232 +0200 -@@ -101,6 +101,17 @@ typedef struct - } \ - } - -+#define PARAM_DICT_INT(name, dict_name) \ -+ { \ -+ if(!strcasecmp(name, key)) \ -+ { \ -+ char buf[128]; \ -+ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ -+ av_dict_set(options, dict_name, buf, 0); \ -+ found = 1; \ -+ } \ -+ } -+ - #define PARAM_DICT_FLAG(name, dict_name) \ - { \ - if(!strcasecmp(name, key)) \ -@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_max_b_frames",max_b_frames); - PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); - PARAM_INT("ff_b_frame_strategy",b_frame_strategy); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); -+ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); -+#else - PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); - PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); -+#endif -+ - PARAM_INT("ff_strict_std_compliance",strict_std_compliance); - PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); - PARAM_INT("ff_rc_min_rate",rc_min_rate); -@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_QP2LAMBDA("ff_lmax", lmax); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); -+ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); -+#else - PARAM_INT("ff_inter_threshold",inter_threshold); - PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); -+#endif -+ - PARAM_INT("ff_thread_count",thread_count); - PARAM_INT("ff_me_threshold",me_threshold); - PARAM_INT("ff_mb_threshold",mb_threshold); -@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); - PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); -+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); -+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); -+#else - PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); - PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+#endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 - PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); -@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); - PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); - PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); - PARAM_ENUM("ff_coder_type",coder_type,coder_type); - - } -diff -up libquicktime-1.2.4/plugins/ffmpeg/video.c.backport libquicktime-1.2.4/plugins/ffmpeg/video.c ---- libquicktime-1.2.4/plugins/ffmpeg/video.c.backport 2012-02-25 20:46:56.000000000 +0100 -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c 2013-08-26 12:21:24.272962173 +0200 -@@ -400,7 +400,17 @@ static void lqt_ffmpeg_setup_decoding_co - codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; - - /* First we try codec-specific colormodel matching. */ -- if(codec->decoder->id == CODEC_ID_DNXHD) -+ if(codec->is_imx && quicktime_match_32(vtrack->track->mdia.minf.stbl.stsd.table[0].format, "AVmp")) -+ { -+ if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) -+ { -+ vtrack->stream_cmodel = BC_YUVJ422P; -+ codec->reinterpret_pix_fmt = PIX_FMT_YUVJ422P; -+ *exact = 1; -+ return; -+ } -+ } -+ else if(codec->decoder->id == CODEC_ID_DNXHD) - { - /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which - we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -@@ -662,12 +672,13 @@ static void lqt_ffmpeg_imx_setup_decodin - codec->y_offset = codec->avctx->height - trak->tkhd.track_height; - vtrack->height_extension = 0; - } else { -+ int stsd_height = trak->mdia.minf.stbl.stsd.table[0].height; - codec->y_offset = 0; -- if (vtrack->height_extension == codec->avctx->height - trak->tkhd.track_height) { -+ if (vtrack->height_extension == codec->avctx->height - stsd_height) { - return; - } - -- vtrack->height_extension = codec->avctx->height - trak->tkhd.track_height; -+ vtrack->height_extension = codec->avctx->height - stsd_height; - - /* Now we need a larger temp_frame */ - if (vtrack->temp_frame) { -@@ -883,8 +894,9 @@ static int lqt_ffmpeg_decode_video(quick - &got_pic, - &codec->pkt) < 0) - { -- lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "Skipping corrupted frame"); -- continue; -+ lqt_log(file, LQT_LOG_WARNING, LOG_DOMAIN, "Broken frame encountered"); -+ codec->decoding_delay--; -+ return 1; - } - - #if LIBAVCODEC_VERSION_MAJOR >= 54 -@@ -907,15 +919,16 @@ static int lqt_ffmpeg_decode_video(quick - codec->buffer, - buffer_size) < 0) - { -- lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "Skipping corrupted frame"); -- continue; -+ lqt_log(file, LQT_LOG_WARNING, LOG_DOMAIN, "Broken frame encountered"); -+ codec->decoding_delay--; -+ return 1; - } - #endif - if(got_pic) - codec->decoding_delay--; - - if((buffer_size <= 0) && !got_pic) -- return 0; -+ return 1; - } - } - -@@ -972,9 +985,11 @@ static int lqt_ffmpeg_decode_video(quick - - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; - vtrack->ci.id = LQT_COMPRESSION_D10; -- vtrack->ci.bitrate = -- (trak->mdia.minf.stbl.stsd.table[0].format[2] - '0') * -- 10000000; -+ if (quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "AVmp")) -+ vtrack->ci.bitrate = 50000000; -+ else -+ vtrack->ci.bitrate = -+ (trak->mdia.minf.stbl.stsd.table[0].format[2] - '0') * 10000000; - } - - if(codec->avctx->sample_aspect_ratio.num) -@@ -1138,7 +1153,7 @@ static int init_imx_encoder(quicktime_t - codec->avctx->gop_size = 0; - codec->avctx->intra_dc_precision = 2; - codec->avctx->qmin = 1; -- codec->avctx->qmax = 3; -+ codec->avctx->qmax = codec->imx_bitrate == 30 ? 8 : 3; - codec->avctx->rtp_payload_size = 1; // ?? - codec->avctx->rc_buffer_aggressivity = 0.25; - codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY; -@@ -1294,6 +1309,7 @@ static int lqt_ffmpeg_encode_video(quick - #endif - int64_t pts; - int kf; -+ uint8_t* encoded_data; - - if(!row_pointers) - { -@@ -1335,7 +1351,12 @@ static int lqt_ffmpeg_encode_video(quick - codec->avctx->height = height; - - lqt_ffmpeg_setup_encoding_colormodel(vtrack); -- -+#if ENCODE_VIDEO2 -+ codec->frame->width = width; -+ codec->frame->height = height; -+ codec->frame->format = codec->avctx->pix_fmt; -+#endif -+ - lqt_get_pixel_aspect(file, track, &pixel_width, &pixel_height); - codec->avctx->sample_aspect_ratio.num = pixel_width; - codec->avctx->sample_aspect_ratio.den = pixel_height; -@@ -1540,6 +1561,7 @@ static int lqt_ffmpeg_encode_video(quick - else - bytes_encoded = 0; - -+ encoded_data = pkt.data; // May be different from codec->buffer! - pts = pkt.pts; - kf = !!(pkt.flags & AV_PKT_FLAG_KEY); - -@@ -1553,6 +1575,7 @@ static int lqt_ffmpeg_encode_video(quick - if(bytes_encoded < 0) - return -1; - -+ encoded_data = codec->buffer; - pts = codec->avctx->coded_frame->pts; - kf = codec->avctx->coded_frame->key_frame; - -@@ -1575,9 +1598,13 @@ static int lqt_ffmpeg_encode_video(quick - kf); - - result = !quicktime_write_data(file, -- codec->buffer, -+ encoded_data, - bytes_encoded); - -+#if ENCODE_VIDEO2 -+ av_free_packet(&pkt); -+#endif -+ - lqt_write_frame_footer(file, track); - - /* Write stats */ -@@ -1959,7 +1986,8 @@ void quicktime_init_video_codec_ffmpeg(q - quicktime_match_32(compressor, "mx5p") || - quicktime_match_32(compressor, "mx3n") || - quicktime_match_32(compressor, "mx4n") || -- quicktime_match_32(compressor, "mx5n")) -+ quicktime_match_32(compressor, "mx5n") || -+ quicktime_match_32(compressor, "AVmp")) - { - vtrack->stream_cmodel = BC_YUV422P; - codec->is_imx = 1; diff --git a/libquicktime.spec b/libquicktime.spec index 4667637..6f11cc3 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,14 +1,18 @@ +%define vers_string 1.2.4-93-g4d45177 +%define rel_string .20170926.93.g4d45177 +%define githash 4d451774b89fbdd2f53204f92b71837af7b06761 +%define shorthash %(c=%{githash}; echo ${c:0:10}) + + Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 27%{?dist} +Release: 28%{?rel_string}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ -Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... -Patch0: libquicktime-backport.patch -Patch1: libav10.patch -Patch2: ffmpeg_2.9.patch +#Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... +Source0: https://github.com/sergiomb2/%%7Bname%7D/archive/%%7Bgithash%7D/%%7Bname%7D-...
BuildRequires: libdv-devel BuildRequires: libpng-devel libjpeg-devel libGLU-devel @@ -22,6 +26,9 @@ BuildRequires: schroedinger-devel BuildRequires: gettext-devel %{?_with_faac:BuildRequires: faac-devel}
+# Packages for re-configuration +BuildRequires: autoconf, automake, libtool + %package utils Summary: Utilities for working with Quicktime files Group: Applications/Multimedia @@ -58,15 +65,12 @@ enhancements. This package contains development files for %{name}. # --------------------------------------------------------------------
%prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - +%setup -q -n %{name}-%{githash}
# --------------------------------------------------------------------
%build +./autogen.sh %configure \ --enable-gpl \ --disable-rpath \ @@ -81,12 +85,12 @@ enhancements. This package contains development files for %{name}. sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags} +%make_build
# --------------------------------------------------------------------
%install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ;
@@ -126,6 +130,11 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sun Jan 21 2018 Sérgio Basto sergio@serjux.com - 1.2.4-28.20170926.93.g4d45177 +- Update to 1.2.4-93-g4d45177 +- Upstream have the official patches for ffmpeg_2.9.patch libav10.patch libquicktime-backport.patch +- This release have some security fixes + * Wed Jan 17 2018 Leigh Scott leigh123linux@googlemail.com - 1.2.4-27 - Rebuilt for ffmpeg-3.5 git
diff --git a/sources b/sources index 60c733c..0b5e84a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81cfcebad9b7ee7e7cfbefc861d6d61b libquicktime-1.2.4.tar.gz +a6d79eb99e6e6e35eead1cdb32cee9ea libquicktime-1.2.4-4d451774b8.tar.gz diff --git a/update_libquicktime.sh b/update_libquicktime.sh new file mode 100755 index 0000000..556d147 --- /dev/null +++ b/update_libquicktime.sh @@ -0,0 +1,31 @@ +git clone git://github.com/sergiomb2/libquicktime.git +version=1.2.4 +tag=$version +pushd libquicktime +git checkout master +git pull +git log $tag..HEAD > ../ChangeLog +newdescrib=$(git describe --tags) +date=$(git log -1 --format=%cd --date=short | tr -d -) +relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/^/.$date/") +githash=$(git rev-parse HEAD) +shorthash=$(echo $githash | cut -b -10) +popd +#git checkout libquicktime.spec +sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" libquicktime.spec +sed -i "s|^%define rel_string .*|%define rel_string $relversion|" libquicktime.spec +sed -i "s|^%define githash .*|%define githash $githash|" libquicktime.spec +rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" libquicktime.spec +spectool -g libquicktime.spec +echo Press enter to run: rfpkg new-sources libquicktime-${version}-${shorthash}.tar.gz; read dummy; +rfpkg new-sources libquicktime-${version}-${shorthash}.tar.gz +echo Press enter to continue; read dummy; +rfpkg ci -c && git show +echo Press enter to continue; read dummy; +rfpkg push && rfpkg build --nowait +echo Press enter to continue; read dummy; +git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master +echo Press enter to continue; read dummy; +git checkout f26 && git merge master && git push && rfpkg build --nowait; git checkout master +echo Press enter to continue; read dummy; +git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
commit 63eab93091730ed5c5e338a3af427604819a91de Author: leigh123linux leigh123linux@googlemail.com Date: Wed Jan 17 22:51:58 2018 +0000
Rebuilt for ffmpeg-3.5 git
diff --git a/libquicktime.spec b/libquicktime.spec index cd24a8a..4667637 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 26%{?dist} +Release: 27%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -126,6 +126,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Wed Jan 17 2018 Leigh Scott leigh123linux@googlemail.com - 1.2.4-27 +- Rebuilt for ffmpeg-3.5 git + * Sat Dec 30 2017 Sérgio Basto sergio@serjux.com - 1.2.4-26 - Mass rebuild for x264 and x265
commit ff58bf9643ac870db2b4dc1e7575496502a1d4bb Author: Sérgio M. Basto sergio@serjux.com Date: Sat Dec 30 23:51:11 2017 +0000
Mass rebuild for x264 and x265
diff --git a/libquicktime.spec b/libquicktime.spec index cfad4e8..cd24a8a 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 25%{?dist} +Release: 26%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -126,6 +126,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sat Dec 30 2017 Sérgio Basto sergio@serjux.com - 1.2.4-26 +- Mass rebuild for x264 and x265 + * Thu Aug 31 2017 RPM Fusion Release Engineering kwizart@rpmfusion.org - 1.2.4-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit f799a0771de2a82ddeb07e1442cdb656933926f4 Author: Nicolas Chauvet kwizart@gmail.com Date: Thu Aug 31 16:25:25 2017 +0200
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/libquicktime.spec b/libquicktime.spec index d5cb016..cfad4e8 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 24%{?dist} +Release: 25%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -126,6 +126,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Thu Aug 31 2017 RPM Fusion Release Engineering kwizart@rpmfusion.org - 1.2.4-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Apr 29 2017 Leigh Scott leigh123linux@googlemail.com - 1.2.4-24 - Rebuild for ffmpeg update
commit 76c5a73376fcad8acd1d7f49569705f7a8547c42 Author: leigh123linux leigh123linux@googlemail.com Date: Sat Apr 29 15:56:00 2017 +0100
Rebuild for ffmpeg update
diff --git a/libquicktime.spec b/libquicktime.spec index ef4ebef..d5cb016 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 23%{?dist} +Release: 24%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -126,6 +126,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sat Apr 29 2017 Leigh Scott leigh123linux@googlemail.com - 1.2.4-24 +- Rebuild for ffmpeg update + * Sun Mar 19 2017 RPM Fusion Release Engineering kwizart@rpmfusion.org - 1.2.4-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit 3d8f4752abce16342ab97c7f07e37a914688f912 Author: Nicolas Chauvet kwizart@gmail.com Date: Sun Mar 19 23:00:30 2017 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/libquicktime.spec b/libquicktime.spec index 353565d..ef4ebef 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 22%{?dist} +Release: 23%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -126,6 +126,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sun Mar 19 2017 RPM Fusion Release Engineering kwizart@rpmfusion.org - 1.2.4-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Jul 30 2016 Julian Sikorski belegdol@fedoraproject.org - 1.2.4-22 - Rebuilt for ffmpeg-3.1.1
commit 19cdf6026139a17c0d2263ca1ac13f10294f3ee0 Author: Julian Sikorski belegdol@fedoraproject.org Date: Sat Jul 30 15:54:59 2016 +0200
Rebuilt for ffmpeg-3.1.1
diff --git a/libquicktime.spec b/libquicktime.spec index f7344b8..353565d 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 21%{?dist} +Release: 22%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -126,6 +126,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sat Jul 30 2016 Julian Sikorski belegdol@fedoraproject.org - 1.2.4-22 +- Rebuilt for ffmpeg-3.1.1 + * Sat May 14 2016 Michael Kuhn suraia@ikkoku.de - 1.2.4-21 - Add patches for libav 10 and ffmpeg 3.0.
commit b8458e289c7782b1c54b00e59b15e1c2a850efff Author: Michael Kuhn suraia@ikkoku.de Date: Sat May 14 21:15:23 2016 +0200
Bump release.
diff --git a/libquicktime.spec b/libquicktime.spec index 396bc8f..f7344b8 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 20%{?dist} +Release: 21%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -126,6 +126,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sat May 14 2016 Michael Kuhn suraia@ikkoku.de - 1.2.4-21 +- Add patches for libav 10 and ffmpeg 3.0. + * Mon Oct 26 2015 Nicolas Chauvet kwizart@gmail.com - 1.2.4-20 - Bump for x264
commit 92210f04a66f15656c286620a9ed2045f3c0f8d3 Author: Michael Kuhn suraia@ikkoku.de Date: Sat May 14 11:25:52 2016 +0200
Add patch for ffmpeg 3.0.
diff --git a/ffmpeg_2.9.patch b/ffmpeg_2.9.patch new file mode 100644 index 0000000..cefc7fe --- /dev/null +++ b/ffmpeg_2.9.patch @@ -0,0 +1,351 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun Andreas.Cadhalpun@googlemail.com +Last-Update: <2015-11-02> + +--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c ++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c +@@ -1267,7 +1267,7 @@ static int lqt_ffmpeg_encode_audio(quick + pkt.data = codec->chunk_buffer; + pkt.size = codec->chunk_buffer_alloc; + +- avcodec_get_frame_defaults(&f); ++ av_frame_unref(&f); + f.nb_samples = codec->avctx->frame_size; + + avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, +--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c ++++ libquicktime-1.2.4/plugins/ffmpeg/params.c +@@ -158,7 +158,6 @@ enum_t coder_type[] = + { "Arithmetic", FF_CODER_TYPE_AC }, + { "Raw", FF_CODER_TYPE_RAW }, + { "RLE", FF_CODER_TYPE_RLE }, +- { "Deflate", FF_CODER_TYPE_DEFLATE }, + }; + + #define PARAM_ENUM(name, var, arr) \ +@@ -253,15 +252,13 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation); + PARAM_INT("ff_bidir_refine",bidir_refine); + PARAM_INT("ff_brd_scale",brd_scale); +- PARAM_INT("ff_scenechange_factor",scenechange_factor); + PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE); + PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV); + PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL); +- PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC); ++ PARAM_DICT_FLAG("ff_flag_gmc", "gmc"); + PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0); + // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused + PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY); +- PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE); + PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP); + // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) +--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h ++++ libquicktime-1.2.4/plugins/ffmpeg/params.h +@@ -149,7 +149,7 @@ the reference. Unused for constant quant + .type = LQT_PARAMETER_INT, \ + .val_default = { .val_int = 0 }, \ + .val_min = { .val_int = 0 }, \ +- .val_max = { .val_int = FF_MAX_B_FRAMES }, \ ++ .val_max = { .val_int = INT_MAX }, \ + .help_string = TRS("Maximum number of B-frames between non B-frames") \ + } + +--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c ++++ libquicktime-1.2.4/plugins/ffmpeg/video.c +@@ -37,10 +37,10 @@ + #endif + + +-#ifdef PIX_FMT_YUV422P10 +-#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 ++#ifdef AV_PIX_FMT_YUV422P10 ++#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 + #else +-#define PIX_FMT_YUV422P10_OR_DUMMY -1234 ++#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 + #endif + + #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) +@@ -90,9 +90,9 @@ typedef struct + int imx_bitrate; + int imx_strip_vbi; + +- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while +- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ +- enum PixelFormat reinterpret_pix_fmt; ++ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while ++ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ ++ enum AVPixelFormat reinterpret_pix_fmt; + + int is_imx; + int y_offset; +@@ -137,42 +137,42 @@ typedef struct + + static const struct + { +- enum PixelFormat ffmpeg_id; ++ enum AVPixelFormat ffmpeg_id; + int lqt_id; + int exact; + } + colormodels[] = + { +- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) ++ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) + #if LIBAVUTIL_VERSION_INT < (50<<16) +- { PIX_FMT_YUV422, BC_YUV422, 1 }, ++ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, + #else +- { PIX_FMT_YUYV422, BC_YUV422, 1 }, ++ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, + #endif +- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... +- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... +- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) +- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) +- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) +- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) +-#ifdef PIX_FMT_YUV422P10 +- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 +-#endif +- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness +- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) +- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) +- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) ++ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... ++ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... ++ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) ++ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) ++ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) ++ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) ++#ifdef AV_PIX_FMT_YUV422P10 ++ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 ++#endif ++ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness ++ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) ++ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) ++ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) + #if LIBAVUTIL_VERSION_INT < (50<<16) +- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + #else +- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + #endif +- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 +- { PIX_FMT_GRAY8, BC_RGB888, 0 }, +- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white +- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black +- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette +- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) ++ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 ++ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, ++ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white ++ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black ++ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette ++ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) + }; + + static const struct +@@ -248,7 +248,7 @@ static int lqt_ffmpeg_delete_video(quick + if(codec->frame_buffer) free(codec->frame_buffer); + if(codec->buffer) free(codec->buffer); + +- if(codec->frame) av_free(codec->frame); ++ if(codec->frame) av_frame_free(&codec->frame); + + #ifdef HAVE_LIBSWSCALE + if(codec->swsContext) +@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV + if (!codec->pix_fmts) + return 0; + +- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) ++ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) + { +- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) ++ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) + return 1; + } + + return 0; + } + +-static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) ++static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) + { + int i; + +@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f + if(colormodels[i].lqt_id == id) + return colormodels[i].ffmpeg_id; + } +- return PIX_FMT_NB; ++ return AV_PIX_FMT_NB; + } + +-static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) ++static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) + { + int i; + +@@ -405,31 +405,31 @@ static void lqt_ffmpeg_setup_decoding_co + if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) + { + vtrack->stream_cmodel = BC_YUVJ422P; +- codec->reinterpret_pix_fmt = PIX_FMT_YUVJ422P; ++ codec->reinterpret_pix_fmt = AV_PIX_FMT_YUVJ422P; + *exact = 1; + return; + } + } + else if(codec->decoder->id == AV_CODEC_ID_DNXHD) + { +- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which +- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ +- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) ++ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which ++ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ ++ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) + { +- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); ++ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); + *exact = 1; + if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) + { + vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; +- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; +- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except ++ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; ++ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except + // there is no such colormodel in FFMpeg. Fortunately, it's not a problem + // in this case, as reinterpret_pix_fmt is only used when *exact == 0. + } + else + { + vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; +- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; ++ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; + } + return; + } +@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co + + if (codec->encoder->id == AV_CODEC_ID_DNXHD) + { +- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 +- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 ++ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 ++ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 + (in fact, the latter doesn't even exist) */ +- codec->avctx->pix_fmt = PIX_FMT_YUV422P; ++ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; + if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) + { + if (lqt_tenbit_dnxhd_supported(codec->encoder)) +- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; ++ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; + } + } + } +@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co + /* From avcodec.h: */ + + /* +- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA ++ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA + * color is put together as: + * (A << 24) | (R << 16) | (G << 8) | B + * This is stored as BGRA on little endian CPU architectures and ARGB on +@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t + */ + + static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, +- AVFrame * in_frame, enum PixelFormat in_format, ++ AVFrame * in_frame, enum AVPixelFormat in_format, + unsigned char ** out_frame, int out_format, + int width, int height, int row_span, int row_span_uv) + { +@@ -547,9 +547,9 @@ static void convert_image_decode(quickti + * RGBA format like in ffmpeg?? + */ + #if LIBAVUTIL_VERSION_INT < (50<<16) +- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) ++ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) + #else +- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) ++ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) + #endif + { + convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); +@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick + if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) + return -1; + #endif +- codec->frame = avcodec_alloc_frame(); ++ codec->frame = av_frame_alloc(); + vtrack->stream_cmodel = LQT_COLORMODEL_NONE; + codec->initialized = 1; + } +@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick + #ifdef HAVE_LIBSWSCALE + + #if LIBAVUTIL_VERSION_INT < (50<<16) +- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && ++ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && + (vtrack->stream_cmodel == BC_RGBA8888))) + #else +- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && ++ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && + (vtrack->stream_cmodel == BC_RGBA8888))) + #endif + { +@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick + + if(!codec->initialized) + { +- codec->frame = avcodec_alloc_frame(); ++ codec->frame = av_frame_alloc(); + + /* time_base is 1/framerate for constant framerate */ + +@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick + if(vtrack->stream_cmodel == BC_RGBA8888) + { + /* Libquicktime doesn't natively support a color model equivalent +- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. ++ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. + So, we use BC_RGBA8888 and do ad hoc conversion below. */ +- codec->avctx->pix_fmt = PIX_FMT_ARGB; ++ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; + vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; + } + } +@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick + } + // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); + +- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) ++ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) + { + if(!codec->tmp_rows) + { +@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick + vtrack->stream_cmodel, + 0, 0, 0, codec->y_offset); + } +- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) ++ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) + { + convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, + codec->tmp_rows[0], codec->tmp_row_span, +@@ -1600,7 +1600,7 @@ static int lqt_ffmpeg_encode_video(quick + { + int advanced = 0; + if(codec->avctx->max_b_frames || +- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) ++ (codec->avctx->flags & (AV_CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) + advanced = 1; + + setup_header_mpeg4(file, track, codec->avctx->extradata, diff --git a/libquicktime.spec b/libquicktime.spec index 6ee08a4..396bc8f 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -8,6 +8,7 @@ URL: http://libquicktime.sourceforge.net/ Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... Patch0: libquicktime-backport.patch Patch1: libav10.patch +Patch2: ffmpeg_2.9.patch
BuildRequires: libdv-devel BuildRequires: libpng-devel libjpeg-devel libGLU-devel @@ -60,6 +61,7 @@ enhancements. This package contains development files for %{name}. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1
# --------------------------------------------------------------------
commit c7488465f2280eaedc2d037944df9fd340048911 Author: Michael Kuhn suraia@ikkoku.de Date: Sat May 14 11:06:25 2016 +0200
Add patch for libav 10.
diff --git a/libav10.patch b/libav10.patch new file mode 100644 index 0000000..cb85a55 --- /dev/null +++ b/libav10.patch @@ -0,0 +1,654 @@ +Description: build against libav10 (Closes: #739325) +Author: Reinhard Tartler siretart@tauware.de +Bug-Debian: http://bugs.debian.org/739325 +Last-Update: 2014-03-16 + + +--- libquicktime-1.2.4.orig/plugins/ffmpeg/lqt_ffmpeg.c ++++ libquicktime-1.2.4/plugins/ffmpeg/lqt_ffmpeg.c +@@ -386,7 +386,7 @@ static lqt_image_size_static_t image_siz + struct CODECIDMAP codecidmap_v[] = + { + { +- .id = CODEC_ID_MPEG1VIDEO, ++ .id = AV_CODEC_ID_MPEG1VIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -397,7 +397,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE } + }, + { +- .id = CODEC_ID_MPEG4, ++ .id = AV_CODEC_ID_MPEG4, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -415,7 +415,7 @@ struct CODECIDMAP codecidmap_v[] = + .compression_id = LQT_COMPRESSION_MPEG4_ASP, + }, + { +- .id = CODEC_ID_MSMPEG4V1, ++ .id = AV_CODEC_ID_MSMPEG4V1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -426,7 +426,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MSMPEG4V2, ++ .id = AV_CODEC_ID_MSMPEG4V2, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -437,7 +437,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MSMPEG4V3, ++ .id = AV_CODEC_ID_MSMPEG4V3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -453,7 +453,7 @@ struct CODECIDMAP codecidmap_v[] = + .do_encode = 1, + }, + { +- .id = CODEC_ID_MSMPEG4V3, ++ .id = AV_CODEC_ID_MSMPEG4V3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -468,7 +468,7 @@ struct CODECIDMAP codecidmap_v[] = + }, + #if 0 + { +- .id = CODEC_ID_WMV1, ++ .id = AV_CODEC_ID_WMV1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -481,7 +481,7 @@ struct CODECIDMAP codecidmap_v[] = + }, + #endif + { +- .id = CODEC_ID_H263, ++ .id = AV_CODEC_ID_H263, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -493,7 +493,7 @@ struct CODECIDMAP codecidmap_v[] = + .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP, + }, + { +- .id = CODEC_ID_H263, ++ .id = AV_CODEC_ID_H263, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -508,7 +508,7 @@ struct CODECIDMAP codecidmap_v[] = + .do_encode = 1, + }, + { +- .id = CODEC_ID_H264, ++ .id = AV_CODEC_ID_H264, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -519,7 +519,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_H263P, ++ .id = AV_CODEC_ID_H263P, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -533,7 +533,7 @@ struct CODECIDMAP codecidmap_v[] = + .do_encode = 1, + }, + { +- .id = CODEC_ID_H263I, ++ .id = AV_CODEC_ID_H263I, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -544,7 +544,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_SVQ1, ++ .id = AV_CODEC_ID_SVQ1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -555,7 +555,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_SVQ3, ++ .id = AV_CODEC_ID_SVQ3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -566,7 +566,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MJPEG, ++ .id = AV_CODEC_ID_MJPEG, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -580,7 +580,7 @@ struct CODECIDMAP codecidmap_v[] = + .do_encode = 1, + }, + { +- .id = CODEC_ID_MJPEGB, ++ .id = AV_CODEC_ID_MJPEGB, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -594,7 +594,7 @@ struct CODECIDMAP codecidmap_v[] = + }, + #if LIBAVCODEC_BUILD >= 3346688 + { +- .id = CODEC_ID_TARGA, ++ .id = AV_CODEC_ID_TARGA, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -606,7 +606,7 @@ struct CODECIDMAP codecidmap_v[] = + #endif + #if LIBAVCODEC_BUILD >= 3347456 + { +- .id = CODEC_ID_TIFF, ++ .id = AV_CODEC_ID_TIFF, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -617,7 +617,7 @@ struct CODECIDMAP codecidmap_v[] = + }, + #endif + { +- .id = CODEC_ID_8BPS, ++ .id = AV_CODEC_ID_8BPS, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -627,7 +627,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_INDEO3, ++ .id = AV_CODEC_ID_INDEO3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -638,7 +638,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_RPZA, ++ .id = AV_CODEC_ID_RPZA, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -648,7 +648,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_SMC, ++ .id = AV_CODEC_ID_SMC, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -658,7 +658,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_CINEPAK, ++ .id = AV_CODEC_ID_CINEPAK, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -669,7 +669,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_CYUV, ++ .id = AV_CODEC_ID_CYUV, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -680,7 +680,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_QTRLE, ++ .id = AV_CODEC_ID_QTRLE, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -693,7 +693,7 @@ struct CODECIDMAP codecidmap_v[] = + .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE }, + }, + { +- .id = CODEC_ID_MSRLE, ++ .id = AV_CODEC_ID_MSRLE, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -703,7 +703,7 @@ struct CODECIDMAP codecidmap_v[] = + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -719,7 +719,7 @@ struct CODECIDMAP codecidmap_v[] = + .image_sizes = image_sizes_dv, + }, + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -735,7 +735,7 @@ struct CODECIDMAP codecidmap_v[] = + .image_sizes = image_sizes_dv, + }, + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -751,7 +751,7 @@ struct CODECIDMAP codecidmap_v[] = + }, + /* DVCPRO HD (decoding only for now) */ + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -772,7 +772,7 @@ struct CODECIDMAP codecidmap_v[] = + // .do_encode = 1 + }, + { +- .id = CODEC_ID_FFVHUFF, ++ .id = AV_CODEC_ID_FFVHUFF, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -785,7 +785,7 @@ struct CODECIDMAP codecidmap_v[] = + .do_encode = 1 + }, + { +- .id = CODEC_ID_FFV1, ++ .id = AV_CODEC_ID_FFV1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -801,7 +801,7 @@ struct CODECIDMAP codecidmap_v[] = + }, + #if LIBAVCODEC_BUILD >= 3352576 + { +- .id = CODEC_ID_DNXHD, ++ .id = AV_CODEC_ID_DNXHD, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -817,7 +817,7 @@ struct CODECIDMAP codecidmap_v[] = + }, + #endif + { +- .id = CODEC_ID_MPEG2VIDEO, ++ .id = AV_CODEC_ID_MPEG2VIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -839,7 +839,7 @@ struct CODECIDMAP codecidmap_v[] = + struct CODECIDMAP codecidmap_a[] = + { + { +- .id = CODEC_ID_MP3, ++ .id = AV_CODEC_ID_MP3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -851,7 +851,7 @@ struct CODECIDMAP codecidmap_a[] = + .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MP2, ++ .id = AV_CODEC_ID_MP2, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -866,7 +866,7 @@ struct CODECIDMAP codecidmap_a[] = + .compression_id = LQT_COMPRESSION_MP2, + }, + { +- .id = CODEC_ID_AC3, ++ .id = AV_CODEC_ID_AC3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -881,7 +881,7 @@ struct CODECIDMAP codecidmap_a[] = + .compression_id = LQT_COMPRESSION_AC3, + }, + { +- .id = CODEC_ID_QDM2, ++ .id = AV_CODEC_ID_QDM2, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -896,7 +896,7 @@ struct CODECIDMAP codecidmap_a[] = + #if 1 + /* Doesn't work as long as audio chunks are not split into VBR "Samples" */ + { +- .id = CODEC_ID_ALAC, ++ .id = AV_CODEC_ID_ALAC, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -909,7 +909,7 @@ struct CODECIDMAP codecidmap_a[] = + #if 1 + /* Sounds ugly */ + { +- .id = CODEC_ID_ADPCM_MS, ++ .id = AV_CODEC_ID_ADPCM_MS, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -922,7 +922,7 @@ struct CODECIDMAP codecidmap_a[] = + #if 1 + /* Sounds ugly */ + { +- .id = CODEC_ID_ADPCM_IMA_WAV, ++ .id = AV_CODEC_ID_ADPCM_IMA_WAV, + .index = -1, + .encoder = NULL, + .decoder = NULL, +--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c ++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c +@@ -626,7 +632,7 @@ static int decode_chunk(quicktime_t * fi + { + /* If the codec is mp3, make sure to decode the very last frame */ + +- if((codec->avctx->codec_id == CODEC_ID_MP3) && ++ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) && + (codec->bytes_in_chunk_buffer >= 4)) + { + if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0)) +@@ -695,7 +701,7 @@ static int decode_chunk(quicktime_t * fi + + /* Some really broken mp3 files have the header bytes split across 2 chunks */ + +- if(codec->avctx->codec_id == CODEC_ID_MP3) ++ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) + { + if(codec->bytes_in_chunk_buffer < 4) + { +@@ -806,7 +812,7 @@ static int decode_chunk(quicktime_t * fi + + if(bytes_decoded < 0) + { +- if(codec->avctx->codec_id == CODEC_ID_MP3) ++ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) + { + /* For mp3, bytes_decoded < 0 means, that the frame should be muted */ + memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end - +@@ -866,8 +872,8 @@ static void init_compression_info(quickt + quicktime_audio_map_t *track_map = &file->atracks[track]; + quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv; + +- if((codec->decoder->id == CODEC_ID_MP2) || +- (codec->decoder->id == CODEC_ID_MP3)) ++ if((codec->decoder->id == AV_CODEC_ID_MP2) || ++ (codec->decoder->id == AV_CODEC_ID_MP3)) + { + mpa_header h; + uint32_t header; +@@ -909,7 +915,7 @@ static void init_compression_info(quickt + else + track_map->ci.bitrate = h.bitrate; + } +- else if(codec->decoder->id == CODEC_ID_AC3) ++ else if(codec->decoder->id == AV_CODEC_ID_AC3) + { + a52_header h; + uint8_t * ptr; +@@ -986,7 +992,7 @@ static int lqt_ffmpeg_decode_audio(quick + #endif + /* Some codecs need extra stuff */ + +- if(codec->decoder->id == CODEC_ID_ALAC) ++ if(codec->decoder->id == AV_CODEC_ID_ALAC) + { + header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); + if(header) +@@ -995,7 +1001,7 @@ static int lqt_ffmpeg_decode_audio(quick + codec->avctx->extradata_size = header_len; + } + } +- if(codec->decoder->id == CODEC_ID_QDM2) ++ if(codec->decoder->id == AV_CODEC_ID_QDM2) + { + header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); + if(header) +@@ -1495,9 +1501,9 @@ void quicktime_init_audio_codec_ffmpeg(q + codec_base->decode_audio = lqt_ffmpeg_decode_audio; + codec_base->set_parameter = set_parameter; + +- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) ++ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) + codec_base->read_packet = read_packet_mpa; +- else if(decoder->id == CODEC_ID_AC3) ++ else if(decoder->id == AV_CODEC_ID_AC3) + { + codec_base->write_packet = write_packet_ac3; + codec_base->read_packet = read_packet_ac3; +--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c ++++ libquicktime-1.2.4/plugins/ffmpeg/video.c +@@ -400,7 +400,7 @@ static void lqt_ffmpeg_setup_decoding_co + return; + } + } +- else if(codec->decoder->id == CODEC_ID_DNXHD) ++ else if(codec->decoder->id == AV_CODEC_ID_DNXHD) + { + /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which + we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ +@@ -438,7 +438,7 @@ static void lqt_ffmpeg_setup_encoding_co + quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; + codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); + +- if (codec->encoder->id == CODEC_ID_DNXHD) ++ if (codec->encoder->id == AV_CODEC_ID_DNXHD) + { + /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 + and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 +@@ -728,13 +728,13 @@ static int lqt_ffmpeg_decode_video(quick + + /* Set extradata: It's done differently for each codec */ + +- if(codec->decoder->id == CODEC_ID_SVQ3) ++ if(codec->decoder->id == AV_CODEC_ID_SVQ3) + { + extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; + extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; + + } +- else if(codec->decoder->id == CODEC_ID_H264) ++ else if(codec->decoder->id == AV_CODEC_ID_H264) + { + user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); + +@@ -753,7 +753,7 @@ static int lqt_ffmpeg_decode_video(quick + } + + } +- else if(codec->decoder->id == CODEC_ID_MPEG4) ++ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) + { + if(trak->mdia.minf.stbl.stsd.table[0].has_esds) + { +@@ -947,15 +947,15 @@ static int lqt_ffmpeg_decode_video(quick + } + #endif + } +- if(codec->decoder->id == CODEC_ID_DVVIDEO) ++ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) + { + if(vtrack->stream_cmodel == BC_YUV420P) + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; + vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; + vtrack->ci.id = LQT_COMPRESSION_DV; + } +- else if((codec->decoder->id == CODEC_ID_MPEG4) || +- (codec->decoder->id == CODEC_ID_H264)) ++ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || ++ (codec->decoder->id == AV_CODEC_ID_H264)) + { + if(vtrack->stream_cmodel == BC_YUV420P) + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; +@@ -1299,13 +1299,13 @@ static int lqt_ffmpeg_encode_video(quick + { + if(vtrack->stream_cmodel == BC_YUV420P) + { +- if(codec->encoder->id == CODEC_ID_MPEG4) ++ if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; + /* enable interlaced encoding */ + vtrack->interlace_mode = LQT_INTERLACE_NONE; + } +- else if(codec->encoder->id == CODEC_ID_DVVIDEO) ++ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) + { + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; + } +@@ -1340,7 +1340,7 @@ static int lqt_ffmpeg_encode_video(quick + codec->avctx->sample_aspect_ratio.num = pixel_width; + codec->avctx->sample_aspect_ratio.den = pixel_height; + /* Use global headers for mp4v */ +- if(codec->encoder->id == CODEC_ID_MPEG4) ++ if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) + { +@@ -1364,12 +1364,12 @@ static int lqt_ffmpeg_encode_video(quick + } + #endif + } +- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && ++ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && + !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) + { + strncpy(trak->strl->strh.fccHandler, "div3", 4); + } +- else if((codec->encoder->id == CODEC_ID_H263) && ++ else if((codec->encoder->id == AV_CODEC_ID_H263) && + (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) + { + uint8_t d263_data[] = +@@ -1383,7 +1383,7 @@ static int lqt_ffmpeg_encode_video(quick + strncpy(trak->mdia.minf.stbl.stsd.table[0].format, + "s263", 4); + } +- else if(codec->encoder->id == CODEC_ID_FFVHUFF) ++ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) + { + if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) + { +@@ -1391,7 +1391,7 @@ static int lqt_ffmpeg_encode_video(quick + codec->write_global_header = 1; + } + } +- else if(codec->encoder->id == CODEC_ID_QTRLE) ++ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) + { + if(vtrack->stream_cmodel == BC_RGBA8888) + { +@@ -1402,11 +1402,11 @@ static int lqt_ffmpeg_encode_video(quick + vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; + } + } +- else if(codec->encoder->id == CODEC_ID_DVVIDEO) ++ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) + { + set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); + } +- else if(codec->encoder->id == CODEC_ID_DNXHD) ++ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) + { + if(vtrack->interlace_mode != LQT_INTERLACE_NONE) + { +@@ -1558,12 +1558,12 @@ static int lqt_ffmpeg_encode_video(quick + + #endif + +- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) ++ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) + setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); + + if(bytes_encoded) + { +- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) ++ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) + { + /* Some codecs don't bother generating presentation timestamps. + FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ +@@ -1590,13 +1590,13 @@ static int lqt_ffmpeg_encode_video(quick + + if(codec->write_global_header && !codec->global_header_written) + { +- if(codec->encoder->id == CODEC_ID_FFVHUFF) ++ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) + { + quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, + "glbl", + codec->avctx->extradata, codec->avctx->extradata_size ); + } +- else if(codec->encoder->id == CODEC_ID_MPEG4) ++ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + int advanced = 0; + if(codec->avctx->max_b_frames || +@@ -1903,18 +1903,18 @@ void quicktime_init_video_codec_ffmpeg(q + codec_base->encode_video = lqt_ffmpeg_encode_video; + codec_base->set_pass = set_pass_ffmpeg; + +- if(encoder->id == CODEC_ID_MPEG4) ++ if(encoder->id == AV_CODEC_ID_MPEG4) + { + codec_base->writes_compressed = writes_compressed_mpeg4; + codec_base->init_compressed = init_compressed_mpeg4; + codec_base->write_packet = write_packet_mpeg4; + } +- else if(encoder->id == CODEC_ID_MPEG2VIDEO) ++ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) + { + codec_base->writes_compressed = writes_compressed_imx; + codec_base->init_compressed = init_compressed_imx; + } +- else if(encoder->id == CODEC_ID_DVVIDEO) ++ else if(encoder->id == AV_CODEC_ID_DVVIDEO) + { + codec_base->init_compressed = init_compressed_dv; + } +@@ -1922,7 +1922,7 @@ void quicktime_init_video_codec_ffmpeg(q + } + if(decoder) + { +- if(decoder->id == CODEC_ID_H264) ++ if(decoder->id == AV_CODEC_ID_H264) + codec_base->read_packet = read_packet_h264; + codec_base->decode_video = lqt_ffmpeg_decode_video; + } diff --git a/libquicktime.spec b/libquicktime.spec index 582b87a..6ee08a4 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -7,6 +7,7 @@ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... Patch0: libquicktime-backport.patch +Patch1: libav10.patch
BuildRequires: libdv-devel BuildRequires: libpng-devel libjpeg-devel libGLU-devel @@ -58,6 +59,7 @@ enhancements. This package contains development files for %{name}. %prep %setup -q %patch0 -p1 +%patch1 -p1
# --------------------------------------------------------------------
commit 3577a57d1b3411f9eb0aa0772178438d7dadef75 Author: Nicolas Chauvet kwizart@gmail.com Date: Mon Oct 26 17:52:20 2015 +0100
Bump for x264
diff --git a/libquicktime.spec b/libquicktime.spec index 7208227..582b87a 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 19%{?dist} +Release: 20%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Mon Oct 26 2015 Nicolas Chauvet kwizart@gmail.com - 1.2.4-20 +- Bump for x264 + * Sun Oct 19 2014 Sérgio Basto sergio@serjux.com - 1.2.4-19 - Rebuilt for FFmpeg 2.4.3
commit b442813bc73595c0c032b4fe554afc9e90a39ed8 Author: Sérgio M. Basto sergio@serjux.com Date: Sun Oct 19 21:36:39 2014 +0000
Rebuilt for FFmpeg 2.4.3
diff --git a/libquicktime.spec b/libquicktime.spec index bc6ad33..7208227 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 18%{?dist} +Release: 19%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sun Oct 19 2014 Sérgio Basto sergio@serjux.com - 1.2.4-19 +- Rebuilt for FFmpeg 2.4.3 + * Fri Sep 26 2014 Nicolas Chauvet kwizart@gmail.com - 1.2.4-18 - Rebuilt for FFmpeg 2.4.x
commit 745ab6d0fb3899051998aa60674b4a6dc1ce9539 Author: Nicolas Chauvet kwizart@gmail.com Date: Fri Sep 26 19:05:47 2014 +0000
* Fri Sep 26 2014 Nicolas Chauvet kwizart@gmail.com - 1.2.4-18 - Rebuilt for FFmpeg 2.4.x
diff --git a/libquicktime.spec b/libquicktime.spec index dc8a997..bc6ad33 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 17%{?dist} +Release: 18%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Fri Sep 26 2014 Nicolas Chauvet kwizart@gmail.com - 1.2.4-18 +- Rebuilt for FFmpeg 2.4.x + * Thu Aug 07 2014 Sérgio Basto sergio@serjux.com - 1.2.4-17 - Rebuilt for ffmpeg-2.3
commit 5fb431c38b9cf8b2e48d4ceb35ce6b722ccdb36b Author: Sérgio M. Basto sergio@serjux.com Date: Thu Aug 7 01:25:10 2014 +0000
Rebuilt for ffmpeg-2.3
diff --git a/libquicktime.spec b/libquicktime.spec index 783bdf1..dc8a997 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 16%{?dist} +Release: 17%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Thu Aug 07 2014 Sérgio Basto sergio@serjux.com - 1.2.4-17 +- Rebuilt for ffmpeg-2.3 + * Tue Mar 25 2014 Sérgio Basto sergio@serjux.com - 1.2.4-16 - Rebuild for ffmpeg-2.2
commit 98fa4464a8101df4e1bef4056f512f6342e9778b Author: Sérgio M. Basto sergio@serjux.com Date: Tue Mar 25 19:04:32 2014 +0000
* Tue Mar 25 2014 Sérgio Basto sergio@serjux.com - 1.2.4-16 - Rebuild for ffmpeg-2.2
diff --git a/libquicktime.spec b/libquicktime.spec index 013f045..783bdf1 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 15%{?dist} +Release: 16%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Mar 25 2014 Sérgio Basto sergio@serjux.com - 1.2.4-16 +- Rebuild for ffmpeg-2.2 + * Sat Mar 22 2014 Sérgio Basto sergio@serjux.com - 1.2.4-15 - Rebuilt for x264
commit d8129cb79b478ce528890b10a9379846e6a7ae5b Author: Sérgio M. Basto sergio@serjux.com Date: Fri Mar 21 23:44:17 2014 +0000
* Sat Mar 22 2014 Sérgio Basto sergio@serjux.com - 1.2.4-15 - Rebuilt for x264
diff --git a/libquicktime.spec b/libquicktime.spec index 85cde06..013f045 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Sat Mar 22 2014 Sérgio Basto sergio@serjux.com - 1.2.4-15 +- Rebuilt for x264 + * Thu Mar 06 2014 Nicolas Chauvet kwizart@gmail.com - 1.2.4-14 - Rebuilt for x264
commit 7a9bda5f60ddf1fb58dbfdf7d1b94e39d75bc9d6 Author: Nicolas Chauvet kwizart@gmail.com Date: Thu Mar 6 07:22:13 2014 +0000
Rebuilt for x264
diff --git a/libquicktime.spec b/libquicktime.spec index ab39181..85cde06 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 13%{?dist} +Release: 14%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Thu Mar 06 2014 Nicolas Chauvet kwizart@gmail.com - 1.2.4-14 +- Rebuilt for x264 + * Tue Nov 05 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-13 - Rebuilt for x264/FFmpeg
commit f5aa589f43228a8c71ab66e7778c163fe423a634 Author: Nicolas Chauvet kwizart@gmail.com Date: Tue Nov 5 20:08:11 2013 +0000
* Tue Nov 05 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-13 - Rebuilt for x264/FFmpeg
diff --git a/libquicktime.spec b/libquicktime.spec index b409f51..ab39181 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Nov 05 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-13 +- Rebuilt for x264/FFmpeg + * Tue Oct 22 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-12 - Rebuilt for x264
commit 1f7ee6ff0e3537ebba53570b761180d0299f2775 Author: Nicolas Chauvet kwizart@gmail.com Date: Tue Oct 22 18:38:32 2013 +0000
* Tue Oct 22 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-12 - Rebuilt for x264
diff --git a/libquicktime.spec b/libquicktime.spec index 3c0687c..b409f51 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Tue Oct 22 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-12 +- Rebuilt for x264 + * Mon Sep 30 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-11 - Rebuilt
commit c28ae8cb9c346be795172c0194a5a2c3e4df2daa Author: Nicolas Chauvet kwizart@gmail.com Date: Mon Sep 30 08:39:00 2013 +0000
* Mon Sep 30 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-11 - Rebuilt
diff --git a/libquicktime.spec b/libquicktime.spec index 14db351..3c0687c 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -122,6 +122,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; # --------------------------------------------------------------------
%changelog +* Mon Sep 30 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-11 +- Rebuilt + * Mon Aug 26 2013 Hans de Goede j.w.r.degoede@gmail.com - 1.2.4-10 - Really fix build with FFmpeg 2.0x
commit b2652a3e23f6d1810aaa6ab59b13d8eed810a9f3 Author: Hans de Goede j.w.r.degoede@gmail.com Date: Mon Aug 26 10:26:52 2013 +0000
* Mon Aug 26 2013 Hans de Goede j.w.r.degoede@gmail.com - 1.2.4-10 - Really fix build with FFmpeg 2.0x
diff --git a/libquicktime-backport.patch b/libquicktime-backport.patch index 60adde5..14253da 100644 --- a/libquicktime-backport.patch +++ b/libquicktime-backport.patch @@ -1,6 +1,22 @@ ---- plugins/ffmpeg/params.c 2012/03/07 14:10:41 1.18 -+++ plugins/ffmpeg/params.c 2013/05/07 09:18:51 1.19 -@@ -101,6 +101,17 @@ +diff -up libquicktime-1.2.4/plugins/ffmpeg/audio.c.backport libquicktime-1.2.4/plugins/ffmpeg/audio.c +--- libquicktime-1.2.4/plugins/ffmpeg/audio.c.backport 2012-03-29 21:44:28.000000000 +0200 ++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c 2013-08-26 12:14:47.099995207 +0200 +@@ -45,6 +45,11 @@ + #define ENCODE_AUDIO 1 + #endif + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++/* from libavcodec/avcodec.h dated Dec 23 2012 */ ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ + /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ + + /* MPEG Audio header parsing code */ +diff -up libquicktime-1.2.4/plugins/ffmpeg/params.c.backport libquicktime-1.2.4/plugins/ffmpeg/params.c +--- libquicktime-1.2.4/plugins/ffmpeg/params.c.backport 2012-03-07 15:10:41.000000000 +0100 ++++ libquicktime-1.2.4/plugins/ffmpeg/params.c 2013-08-26 12:14:47.098995232 +0200 +@@ -101,6 +101,17 @@ typedef struct } \ }
@@ -18,7 +34,7 @@ #define PARAM_DICT_FLAG(name, dict_name) \ { \ if(!strcasecmp(name, key)) \ -@@ -202,8 +213,15 @@ +@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon PARAM_INT("ff_max_b_frames",max_b_frames); PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); PARAM_INT("ff_b_frame_strategy",b_frame_strategy); @@ -34,7 +50,7 @@ PARAM_INT("ff_strict_std_compliance",strict_std_compliance); PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); PARAM_INT("ff_rc_min_rate",rc_min_rate); -@@ -241,8 +259,15 @@ +@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon PARAM_QP2LAMBDA("ff_lmax", lmax); PARAM_INT("ff_noise_reduction",noise_reduction); PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); @@ -50,7 +66,7 @@ PARAM_INT("ff_thread_count",thread_count); PARAM_INT("ff_me_threshold",me_threshold); PARAM_INT("ff_mb_threshold",mb_threshold); -@@ -272,8 +297,16 @@ +@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused @@ -67,7 +83,7 @@
#if LIBAVCODEC_VERSION_MAJOR >= 54 PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); -@@ -288,7 +321,6 @@ +@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); @@ -75,23 +91,10 @@ PARAM_ENUM("ff_coder_type",coder_type,coder_type);
} ---- plugins/ffmpeg/audio.c 2012/03/29 19:44:28 1.61 -+++ plugins/ffmpeg/audio.c 2013/04/21 21:54:58 1.62 -@@ -45,6 +45,11 @@ - #define ENCODE_AUDIO 1 - #endif - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+/* from libavcodec/avcodec.h dated Dec 23 2012 */ -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#endif -+ - /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ - - /* MPEG Audio header parsing code */ ---- plugins/ffmpeg/video.c 2012/11/27 15:46:40 1.117 -+++ plugins/ffmpeg/video.c 2013/06/05 15:10:48 1.123 -@@ -469,7 +469,17 @@ +diff -up libquicktime-1.2.4/plugins/ffmpeg/video.c.backport libquicktime-1.2.4/plugins/ffmpeg/video.c +--- libquicktime-1.2.4/plugins/ffmpeg/video.c.backport 2012-02-25 20:46:56.000000000 +0100 ++++ libquicktime-1.2.4/plugins/ffmpeg/video.c 2013-08-26 12:21:24.272962173 +0200 +@@ -400,7 +400,17 @@ static void lqt_ffmpeg_setup_decoding_co codec->reinterpret_pix_fmt = codec->avctx->pix_fmt;
/* First we try codec-specific colormodel matching. */ @@ -110,7 +113,7 @@ { /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -@@ -731,12 +741,13 @@ +@@ -662,12 +672,13 @@ static void lqt_ffmpeg_imx_setup_decodin codec->y_offset = codec->avctx->height - trak->tkhd.track_height; vtrack->height_extension = 0; } else { @@ -126,7 +129,7 @@
/* Now we need a larger temp_frame */ if (vtrack->temp_frame) { -@@ -952,8 +963,9 @@ +@@ -883,8 +894,9 @@ static int lqt_ffmpeg_decode_video(quick &got_pic, &codec->pkt) < 0) { @@ -138,7 +141,7 @@ }
#if LIBAVCODEC_VERSION_MAJOR >= 54 -@@ -976,15 +988,16 @@ +@@ -907,15 +919,16 @@ static int lqt_ffmpeg_decode_video(quick codec->buffer, buffer_size) < 0) { @@ -158,7 +161,7 @@ } }
-@@ -1041,9 +1054,11 @@ +@@ -972,9 +985,11 @@ static int lqt_ffmpeg_decode_video(quick
vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; vtrack->ci.id = LQT_COMPRESSION_D10; @@ -173,7 +176,7 @@ }
if(codec->avctx->sample_aspect_ratio.num) -@@ -1358,7 +1373,7 @@ +@@ -1138,7 +1153,7 @@ static int init_imx_encoder(quicktime_t codec->avctx->gop_size = 0; codec->avctx->intra_dc_precision = 2; codec->avctx->qmin = 1; @@ -182,7 +185,7 @@ codec->avctx->rtp_payload_size = 1; // ?? codec->avctx->rc_buffer_aggressivity = 0.25; codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY; -@@ -1613,6 +1628,7 @@ +@@ -1294,6 +1309,7 @@ static int lqt_ffmpeg_encode_video(quick #endif int64_t pts; int kf; @@ -190,7 +193,7 @@
if(!row_pointers) { -@@ -1667,7 +1683,12 @@ +@@ -1335,7 +1351,12 @@ static int lqt_ffmpeg_encode_video(quick codec->avctx->height = height;
lqt_ffmpeg_setup_encoding_colormodel(vtrack); @@ -204,23 +207,23 @@ lqt_get_pixel_aspect(file, track, &pixel_width, &pixel_height); codec->avctx->sample_aspect_ratio.num = pixel_width; codec->avctx->sample_aspect_ratio.den = pixel_height; -@@ -1878,6 +1899,7 @@ +@@ -1540,6 +1561,7 @@ static int lqt_ffmpeg_encode_video(quick else bytes_encoded = 0;
+ encoded_data = pkt.data; // May be different from codec->buffer! - pts = pkt.pts * codec->encoding_pts_factor; + pts = pkt.pts; kf = !!(pkt.flags & AV_PKT_FLAG_KEY);
-@@ -1891,6 +1913,7 @@ +@@ -1553,6 +1575,7 @@ static int lqt_ffmpeg_encode_video(quick if(bytes_encoded < 0) return -1;
+ encoded_data = codec->buffer; - pts = codec->avctx->coded_frame->pts * encoding_pts_factor; + pts = codec->avctx->coded_frame->pts; kf = codec->avctx->coded_frame->key_frame;
-@@ -1916,9 +1939,13 @@ +@@ -1575,9 +1598,13 @@ static int lqt_ffmpeg_encode_video(quick kf);
result = !quicktime_write_data(file, @@ -232,10 +235,10 @@ + av_free_packet(&pkt); +#endif + - // Must go before lqt_write_frame_header() which increments vtrack->cur_chunk. - // cur_chunk is a frame number in storage order. - maybe_add_sdtp_entry(file, vtrack->cur_chunk, track); -@@ -2346,7 +2373,8 @@ + lqt_write_frame_footer(file, track); + + /* Write stats */ +@@ -1959,7 +1986,8 @@ void quicktime_init_video_codec_ffmpeg(q quicktime_match_32(compressor, "mx5p") || quicktime_match_32(compressor, "mx3n") || quicktime_match_32(compressor, "mx4n") || diff --git a/libquicktime.spec b/libquicktime.spec index 0f2db76..14db351 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,13 +1,12 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... Patch0: libquicktime-backport.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel BuildRequires: libpng-devel libjpeg-devel libGLU-devel @@ -28,7 +27,8 @@ Group: Applications/Multimedia %package devel Summary: Development files for libquicktime Group: Development/Libraries -Requires: %{name} = %{version}-%{release} zlib-devel pkgconfig +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: zlib-devel
# --------------------------------------------------------------------
@@ -57,7 +57,7 @@ enhancements. This package contains development files for %{name}.
%prep %setup -q -%patch0 -p0 +%patch0 -p1
# -------------------------------------------------------------------- @@ -82,7 +82,6 @@ make %{?_smp_mflags} # --------------------------------------------------------------------
%install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ;
@@ -90,25 +89,18 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; %find_lang %{name}
-# -------------------------------------------------------------------- - -%clean -rm -rf $RPM_BUILD_ROOT - # --------------------------------------------------------------------
%post -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files -f %{name}.lang -%defattr(-,root,root,-) %doc COPYING README TODO %{_libdir}/%{name}*.so.* %dir %{_libdir}/%{name} %{_libdir}/%{name}/lqt_*.so
%files utils -%defattr(-,root,root,-) %{_bindir}/libquicktime_config %{_bindir}/lqt_transcode %{_bindir}/lqtplay @@ -123,7 +115,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/lqtplay.1*
%files devel -%defattr(-,root,root,-) %{_includedir}/lqt/ %{_libdir}/pkgconfig/libquicktime.pc %{_libdir}/%{name}*.so @@ -131,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Mon Aug 26 2013 Hans de Goede j.w.r.degoede@gmail.com - 1.2.4-10 +- Really fix build with FFmpeg 2.0x + * Tue Aug 20 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-9 - Fix build with FFmpeg 2.0x
commit ee8eed490af573be4c4a075579dc60072280633a Author: Nicolas Chauvet kwizart@gmail.com Date: Tue Aug 20 13:33:48 2013 +0000
Fix path
diff --git a/libquicktime-backport.patch b/libquicktime-backport.patch index ff7cc1f..60adde5 100644 --- a/libquicktime-backport.patch +++ b/libquicktime-backport.patch @@ -1,5 +1,5 @@ ---- params.c 2012/03/07 14:10:41 1.18 -+++ params.c 2013/05/07 09:18:51 1.19 +--- plugins/ffmpeg/params.c 2012/03/07 14:10:41 1.18 ++++ plugins/ffmpeg/params.c 2013/05/07 09:18:51 1.19 @@ -101,6 +101,17 @@ } \ } @@ -75,8 +75,8 @@ PARAM_ENUM("ff_coder_type",coder_type,coder_type);
} ---- audio.c 2012/03/29 19:44:28 1.61 -+++ audio.c 2013/04/21 21:54:58 1.62 +--- plugins/ffmpeg/audio.c 2012/03/29 19:44:28 1.61 ++++ plugins/ffmpeg/audio.c 2013/04/21 21:54:58 1.62 @@ -45,6 +45,11 @@ #define ENCODE_AUDIO 1 #endif @@ -89,8 +89,8 @@ /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */
/* MPEG Audio header parsing code */ ---- video.c 2012/11/27 15:46:40 1.117 -+++ video.c 2013/06/05 15:10:48 1.123 +--- plugins/ffmpeg/video.c 2012/11/27 15:46:40 1.117 ++++ plugins/ffmpeg/video.c 2013/06/05 15:10:48 1.123 @@ -469,7 +469,17 @@ codec->reinterpret_pix_fmt = codec->avctx->pix_fmt;
commit 9c2e17d94884ba0be173f58ff614dee37f5d06bd Author: Nicolas Chauvet kwizart@gmail.com Date: Tue Aug 20 11:41:25 2013 +0000
Fix build with FFmpeg 2.0x
diff --git a/libquicktime-backport.patch b/libquicktime-backport.patch new file mode 100644 index 0000000..ff7cc1f --- /dev/null +++ b/libquicktime-backport.patch @@ -0,0 +1,247 @@ +--- params.c 2012/03/07 14:10:41 1.18 ++++ params.c 2013/05/07 09:18:51 1.19 +@@ -101,6 +101,17 @@ + } \ + } + ++#define PARAM_DICT_INT(name, dict_name) \ ++ { \ ++ if(!strcasecmp(name, key)) \ ++ { \ ++ char buf[128]; \ ++ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ ++ av_dict_set(options, dict_name, buf, 0); \ ++ found = 1; \ ++ } \ ++ } ++ + #define PARAM_DICT_FLAG(name, dict_name) \ + { \ + if(!strcasecmp(name, key)) \ +@@ -202,8 +213,15 @@ + PARAM_INT("ff_max_b_frames",max_b_frames); + PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); + PARAM_INT("ff_b_frame_strategy",b_frame_strategy); ++ ++#if LIBAVCODEC_VERSION_MAJOR >= 55 ++ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); ++ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); ++#else + PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); + PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); ++#endif ++ + PARAM_INT("ff_strict_std_compliance",strict_std_compliance); + PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); + PARAM_INT("ff_rc_min_rate",rc_min_rate); +@@ -241,8 +259,15 @@ + PARAM_QP2LAMBDA("ff_lmax", lmax); + PARAM_INT("ff_noise_reduction",noise_reduction); + PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); ++ ++#if LIBAVCODEC_VERSION_MAJOR >= 55 ++ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); ++ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); ++#else + PARAM_INT("ff_inter_threshold",inter_threshold); + PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); ++#endif ++ + PARAM_INT("ff_thread_count",thread_count); + PARAM_INT("ff_me_threshold",me_threshold); + PARAM_INT("ff_mb_threshold",mb_threshold); +@@ -272,8 +297,16 @@ + PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); + PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); + // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused ++ ++#if LIBAVCODEC_VERSION_MAJOR >= 55 ++ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); ++ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); ++ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); ++#else + PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); + PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); ++ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); ++#endif + + #if LIBAVCODEC_VERSION_MAJOR >= 54 + PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); +@@ -288,7 +321,6 @@ + PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); + PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); + PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); +- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); + PARAM_ENUM("ff_coder_type",coder_type,coder_type); + + } +--- audio.c 2012/03/29 19:44:28 1.61 ++++ audio.c 2013/04/21 21:54:58 1.62 +@@ -45,6 +45,11 @@ + #define ENCODE_AUDIO 1 + #endif + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++/* from libavcodec/avcodec.h dated Dec 23 2012 */ ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ + /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ + + /* MPEG Audio header parsing code */ +--- video.c 2012/11/27 15:46:40 1.117 ++++ video.c 2013/06/05 15:10:48 1.123 +@@ -469,7 +469,17 @@ + codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; + + /* First we try codec-specific colormodel matching. */ +- if(codec->decoder->id == CODEC_ID_DNXHD) ++ if(codec->is_imx && quicktime_match_32(vtrack->track->mdia.minf.stbl.stsd.table[0].format, "AVmp")) ++ { ++ if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) ++ { ++ vtrack->stream_cmodel = BC_YUVJ422P; ++ codec->reinterpret_pix_fmt = PIX_FMT_YUVJ422P; ++ *exact = 1; ++ return; ++ } ++ } ++ else if(codec->decoder->id == CODEC_ID_DNXHD) + { + /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which + we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ +@@ -731,12 +741,13 @@ + codec->y_offset = codec->avctx->height - trak->tkhd.track_height; + vtrack->height_extension = 0; + } else { ++ int stsd_height = trak->mdia.minf.stbl.stsd.table[0].height; + codec->y_offset = 0; +- if (vtrack->height_extension == codec->avctx->height - trak->tkhd.track_height) { ++ if (vtrack->height_extension == codec->avctx->height - stsd_height) { + return; + } + +- vtrack->height_extension = codec->avctx->height - trak->tkhd.track_height; ++ vtrack->height_extension = codec->avctx->height - stsd_height; + + /* Now we need a larger temp_frame */ + if (vtrack->temp_frame) { +@@ -952,8 +963,9 @@ + &got_pic, + &codec->pkt) < 0) + { +- lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "Skipping corrupted frame"); +- continue; ++ lqt_log(file, LQT_LOG_WARNING, LOG_DOMAIN, "Broken frame encountered"); ++ codec->decoding_delay--; ++ return 1; + } + + #if LIBAVCODEC_VERSION_MAJOR >= 54 +@@ -976,15 +988,16 @@ + codec->buffer, + buffer_size) < 0) + { +- lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "Skipping corrupted frame"); +- continue; ++ lqt_log(file, LQT_LOG_WARNING, LOG_DOMAIN, "Broken frame encountered"); ++ codec->decoding_delay--; ++ return 1; + } + #endif + if(got_pic) + codec->decoding_delay--; + + if((buffer_size <= 0) && !got_pic) +- return 0; ++ return 1; + } + } + +@@ -1041,9 +1054,11 @@ + + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; + vtrack->ci.id = LQT_COMPRESSION_D10; +- vtrack->ci.bitrate = +- (trak->mdia.minf.stbl.stsd.table[0].format[2] - '0') * +- 10000000; ++ if (quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "AVmp")) ++ vtrack->ci.bitrate = 50000000; ++ else ++ vtrack->ci.bitrate = ++ (trak->mdia.minf.stbl.stsd.table[0].format[2] - '0') * 10000000; + } + + if(codec->avctx->sample_aspect_ratio.num) +@@ -1358,7 +1373,7 @@ + codec->avctx->gop_size = 0; + codec->avctx->intra_dc_precision = 2; + codec->avctx->qmin = 1; +- codec->avctx->qmax = 3; ++ codec->avctx->qmax = codec->imx_bitrate == 30 ? 8 : 3; + codec->avctx->rtp_payload_size = 1; // ?? + codec->avctx->rc_buffer_aggressivity = 0.25; + codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY; +@@ -1613,6 +1628,7 @@ + #endif + int64_t pts; + int kf; ++ uint8_t* encoded_data; + + if(!row_pointers) + { +@@ -1667,7 +1683,12 @@ + codec->avctx->height = height; + + lqt_ffmpeg_setup_encoding_colormodel(vtrack); +- ++#if ENCODE_VIDEO2 ++ codec->frame->width = width; ++ codec->frame->height = height; ++ codec->frame->format = codec->avctx->pix_fmt; ++#endif ++ + lqt_get_pixel_aspect(file, track, &pixel_width, &pixel_height); + codec->avctx->sample_aspect_ratio.num = pixel_width; + codec->avctx->sample_aspect_ratio.den = pixel_height; +@@ -1878,6 +1899,7 @@ + else + bytes_encoded = 0; + ++ encoded_data = pkt.data; // May be different from codec->buffer! + pts = pkt.pts * codec->encoding_pts_factor; + kf = !!(pkt.flags & AV_PKT_FLAG_KEY); + +@@ -1891,6 +1913,7 @@ + if(bytes_encoded < 0) + return -1; + ++ encoded_data = codec->buffer; + pts = codec->avctx->coded_frame->pts * encoding_pts_factor; + kf = codec->avctx->coded_frame->key_frame; + +@@ -1916,9 +1939,13 @@ + kf); + + result = !quicktime_write_data(file, +- codec->buffer, ++ encoded_data, + bytes_encoded); + ++#if ENCODE_VIDEO2 ++ av_free_packet(&pkt); ++#endif ++ + // Must go before lqt_write_frame_header() which increments vtrack->cur_chunk. + // cur_chunk is a frame number in storage order. + maybe_add_sdtp_entry(file, vtrack->cur_chunk, track); +@@ -2346,7 +2373,8 @@ + quicktime_match_32(compressor, "mx5p") || + quicktime_match_32(compressor, "mx3n") || + quicktime_match_32(compressor, "mx4n") || +- quicktime_match_32(compressor, "mx5n")) ++ quicktime_match_32(compressor, "mx5n") || ++ quicktime_match_32(compressor, "AVmp")) + { + vtrack->stream_cmodel = BC_YUV422P; + codec->is_imx = 1; diff --git a/libquicktime.spec b/libquicktime.spec index e6957fa..0f2db76 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,11 +1,12 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... +Patch0: libquicktime-backport.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel @@ -56,6 +57,7 @@ enhancements. This package contains development files for %{name}.
%prep %setup -q +%patch0 -p0
# -------------------------------------------------------------------- @@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Tue Aug 20 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-9 +- Fix build with FFmpeg 2.0x + * Thu Aug 15 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-8 - Rebuilt for FFmpeg 2.0.x
commit 1391112520785c4a9740b1aaaa1a46802622c9a5 Author: Nicolas Chauvet kwizart@gmail.com Date: Thu Aug 15 10:17:08 2013 +0000
* Thu Aug 15 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-8 - Rebuilt for FFmpeg 2.0.x
diff --git a/libquicktime.spec b/libquicktime.spec index 4d67251..e6957fa 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Thu Aug 15 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-8 +- Rebuilt for FFmpeg 2.0.x + * Sat Jul 20 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-7 - Rebuilt for x264
commit 598c520bac31d4468c14f77286ed33a8e34195fe Author: Nicolas Chauvet kwizart@gmail.com Date: Sat Jul 20 09:58:03 2013 +0000
* Sat Jul 20 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-7 - Rebuilt for x264
diff --git a/libquicktime.spec b/libquicktime.spec index 818f7f9..4d67251 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Sat Jul 20 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-7 +- Rebuilt for x264 + * Tue May 07 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-6 - Rebuilt for x264
commit 91e7442eb16209c668d0e5e47a92fce82ce05cb9 Author: Nicolas Chauvet kwizart@gmail.com Date: Tue May 7 14:44:03 2013 +0000
Rebuilt
diff --git a/libquicktime.spec b/libquicktime.spec index 9c46606..818f7f9 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Tue May 07 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-6 +- Rebuilt for x264 + * Sun Jan 20 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-5 - Rebuilt for FFmpeg/x264
commit c74c4a906800a6004c85dbd8d784a33fc29d49e8 Author: Nicolas Chauvet kwizart@gmail.com Date: Sun Jan 20 22:06:12 2013 +0000
Rebuilt for ffmpeg/x264
diff --git a/libquicktime.spec b/libquicktime.spec index d28311f..9c46606 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Sun Jan 20 2013 Nicolas Chauvet kwizart@gmail.com - 1.2.4-5 +- Rebuilt for FFmpeg/x264 + * Fri Nov 23 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.4-4 - Rebuilt for x264
commit e6406d755843c8a684438cbbe368569699ae89da Author: Nicolas Chauvet kwizart@gmail.com Date: Fri Nov 23 08:16:21 2012 +0000
Rebuilt
diff --git a/libquicktime.spec b/libquicktime.spec index b7a0a41..d28311f 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Fri Nov 23 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.4-4 +- Rebuilt for x264 + * Wed Sep 05 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.4-3 - Rebuilt for x264 ABI 125
commit 1be5a621e12b8fd2d0a0d6388b29325182308c56 Author: Nicolas Chauvet kwizart@gmail.com Date: Wed Sep 5 22:18:17 2012 +0000
* Wed Sep 05 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.4-3 - Rebuilt for x264 ABI 125
diff --git a/libquicktime.spec b/libquicktime.spec index 321cb45..b7a0a41 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Wed Sep 05 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.4-3 +- Rebuilt for x264 ABI 125 + * Sun Jun 24 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.4-2 - Rebuild for FFmpeg/x264
commit 147f3a3fbe44c3106dace69b5123ce9af50b71d7 Author: Nicolas Chauvet kwizart@gmail.com Date: Sun Jun 24 14:10:46 2012 +0000
Rebuilt
diff --git a/libquicktime.spec b/libquicktime.spec index 71260ab..321cb45 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Sun Jun 24 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.4-2 +- Rebuild for FFmpeg/x264 + * Tue May 01 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.4-1 - Update to 1.2.4
commit 51775e024840ece2eaadc68c418ec0439d5159d6 Author: Nicolas Chauvet kwizart@gmail.com Date: Tue May 1 20:52:24 2012 +0000
Update to 1.2.4
diff --git a/.gitignore b/.gitignore index b11ad15..8774481 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libquicktime-1.2.3.tar.gz +libquicktime-1.2.4.tar.gz diff --git a/libquicktime.spec b/libquicktime.spec index 5895e40..71260ab 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime -Version: 1.2.3 -Release: 6%{?dist} +Version: 1.2.4 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Tue May 01 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.4-1 +- Update to 1.2.4 + * Tue Mar 13 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.3-6 - Rebuilt for x264 ABI 0.120
diff --git a/sources b/sources index 162e71b..60c733c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a82a1546408605ea8337b3a7c78786e libquicktime-1.2.3.tar.gz +81cfcebad9b7ee7e7cfbefc861d6d61b libquicktime-1.2.4.tar.gz
commit 28cd47e4559ef42e906a86f1787f4b001801d78a Author: Nicolas Chauvet kwizart@gmail.com Date: Tue Mar 13 08:42:28 2012 +0000
* Tue Mar 13 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.3-6 - Rebuilt for x264 ABI 0.120
diff --git a/libquicktime.spec b/libquicktime.spec index ff9e194..5895e40 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.3 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Tue Mar 13 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.3-6 +- Rebuilt for x264 ABI 0.120 + * Wed Feb 22 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.3-5 - Rebuilt for x264/FFmpeg
commit ac3b00a6b46996a4e5361be9ad641f6f6f1849e7 Author: Nicolas Chauvet kwizart@gmail.com Date: Wed Feb 22 22:14:59 2012 +0000
Rebuilt
diff --git a/libquicktime.spec b/libquicktime.spec index 276671e..ff9e194 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.3 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Wed Feb 22 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.3-5 +- Rebuilt for x264/FFmpeg + * Wed Feb 08 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
commit 877eddbc0dadd1eaaf3b03c2ecf16db37317e225 Author: Nicolas Chauvet kwizart@gmail.com Date: Wed Feb 8 21:52:27 2012 +0000
* Wed Feb 08 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/libquicktime.spec b/libquicktime.spec index 30790f0..276671e 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Wed Feb 08 2012 Nicolas Chauvet kwizart@gmail.com - 1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Sep 4 2011 Hans de Goede j.w.r.degoede@gmail.com - 1.2.3-3 - Rebuilt for ffmpeg-0.8
commit 542f3fdc8ab9d1748689771c8b63ff4aece95924 Author: Hans de Goede j.w.r.degoede@gmail.com Date: Sun Sep 4 08:29:17 2011 +0000
* Sun Sep 4 2011 Hans de Goede j.w.r.degoede@gmail.com - 1.2.3-3 - Rebuilt for ffmpeg-0.8
diff --git a/libquicktime.spec b/libquicktime.spec index 324c85d..30790f0 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Sun Sep 4 2011 Hans de Goede j.w.r.degoede@gmail.com - 1.2.3-3 +- Rebuilt for ffmpeg-0.8 + * Fri Jul 15 2011 Nicolas Chauvet kwizart@gmail.com - 1.2.3-2 - Rebuilt for x264 ABI 115
commit 1c2bfbf5678fc189a6381d9ad38a363de483fca9 Author: Nicolas Chauvet kwizart@gmail.com Date: Thu Jul 14 22:02:26 2011 +0000
- Rebuilt for x264 ABI 115
diff --git a/libquicktime.spec b/libquicktime.spec index 29ac12a..324c85d 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Fri Jul 15 2011 Nicolas Chauvet kwizart@gmail.com - 1.2.3-2 +- Rebuilt for x264 ABI 115 + * Mon Jul 11 2011 Nicolas Chauvet kwizart@gmail.com - 1.2.3-1 - Update to 1.2.3
commit 92dd6cf9e7d6c9e1ada8a969b5f11ea856a8fae8 Author: Nicolas Chauvet kwizart@gmail.com Date: Mon Jul 11 20:34:23 2011 +0000
Update to 1.2.3
diff --git a/.gitignore b/.gitignore index 3226a22..b11ad15 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libquicktime-1.2.2.tar.gz +libquicktime-1.2.3.tar.gz diff --git a/libquicktime.spec b/libquicktime.spec index 0e3fadb..29ac12a 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime -Version: 1.2.2 -Release: 2%{?dist} +Version: 1.2.3 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Mon Jul 11 2011 Nicolas Chauvet kwizart@gmail.com - 1.2.3-1 +- Update to 1.2.3 + * Fri Mar 11 2011 Nicolas Chauvet kwizart@gmail.com - 1.2.2-2 - Rebuilt for new x264/FFmpeg
diff --git a/sources b/sources index 8ca0f06..162e71b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -016a0513a7d3fb1b8e64a265152e559d libquicktime-1.2.2.tar.gz +9a82a1546408605ea8337b3a7c78786e libquicktime-1.2.3.tar.gz
commit 9b3b5f4ee2e2ebc80caf9777fe6409d0c5e18aa7 Author: Nicolas Chauvet kwizart@gmail.com Date: Fri Mar 11 08:17:21 2011 +0000
Rebuilt
diff --git a/libquicktime.spec b/libquicktime.spec index 473d383..0e3fadb 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Fri Mar 11 2011 Nicolas Chauvet kwizart@gmail.com - 1.2.2-2 +- Rebuilt for new x264/FFmpeg + * Fri Jan 21 2011 Nicolas Chauvet kwizart@gmail.com - 1.2.2-1 - Update to 1.2.2 - Add %%{_bindir}/lqtremux
commit 69bbcc48e29b327de7e027f09bd486bd8b38e800 Author: Nicolas Chauvet kwizart@gmail.com Date: Fri Jan 21 18:46:18 2011 +0000
Fix build
diff --git a/libquicktime.spec b/libquicktime.spec index e15fc9f..473d383 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -110,6 +110,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/libquicktime_config %{_bindir}/lqt_transcode %{_bindir}/lqtplay +%{_bindir}/lqtremux %{_bindir}/qt2text %{_bindir}/qtdechunk %{_bindir}/qtdump @@ -130,6 +131,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Jan 21 2011 Nicolas Chauvet kwizart@gmail.com - 1.2.2-1 - Update to 1.2.2 +- Add %%{_bindir}/lqtremux
* Sat Jul 10 2010 Nicolas Chauvet kwizart@gmail.com - 1.1.5-2 - Add libquicktime-1.1.5-gtk.patch from Dan Horák.
commit 5dceaa7b4eef74f5018d5a8fec96a0c089ab7d50 Author: Nicolas Chauvet kwizart@gmail.com Date: Fri Jan 21 15:07:27 2011 +0000
Update to 1.2.2
diff --git a/.gitignore b/.gitignore index 872d1e5..3226a22 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libquicktime-1.1.5.tar.gz +libquicktime-1.2.2.tar.gz diff --git a/libquicktime-1.1.5-gtk.patch b/libquicktime-1.1.5-gtk.patch deleted file mode 100644 index ae573af..0000000 --- a/libquicktime-1.1.5-gtk.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk libquicktime-1.1.5/utils/gtk/libquicktime_config.c ---- libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk 2010-07-08 12:21:24.000000000 +0200 -+++ libquicktime-1.1.5/utils/gtk/libquicktime_config.c 2010-07-08 12:22:45.000000000 +0200 -@@ -112,8 +112,8 @@ static MainWindow * create_main_window() - G_CALLBACK(main_window_button_callback), - (gpointer)ret); - -- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); -- GTK_WIDGET_SET_FLAGS (ret->save_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->save_button), TRUE); - - gtk_widget_show(ret->close_button); - gtk_widget_show(ret->save_button); -diff -up libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk libquicktime-1.1.5/utils/gtk/lqt_gtk.c ---- libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk 2010-07-08 12:27:26.000000000 +0200 -+++ libquicktime-1.1.5/utils/gtk/lqt_gtk.c 2010-07-08 12:27:04.000000000 +0200 -@@ -941,9 +941,9 @@ lqtgtk_create_codec_config_window(lqt_co - G_CALLBACK(codec_config_window_button_callback), - (gpointer)ret); - -- GTK_WIDGET_SET_FLAGS (ret->apply_button, GTK_CAN_DEFAULT); -- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); -- GTK_WIDGET_SET_FLAGS (ret->restore_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->apply_button), TRUE); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->restore_button), TRUE); - - gtk_widget_show(ret->apply_button); - gtk_widget_show(ret->close_button); -@@ -1240,7 +1240,7 @@ lqtgtk_create_codec_info_window(const lq - ret->mainbox = gtk_vbox_new(0, 10); - - ret->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); -- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); - - g_signal_connect(G_OBJECT(ret->close_button), "clicked", - G_CALLBACK(codec_info_window_button_callback), diff --git a/libquicktime.spec b/libquicktime.spec index a3aa097..e15fc9f 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,12 +1,11 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime -Version: 1.1.5 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... -Patch0: libquicktime-1.1.5-gtk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel @@ -57,7 +56,6 @@ enhancements. This package contains development files for %{name}.
%prep %setup -q -%patch0 -p1 -b .gtk
# -------------------------------------------------------------------- @@ -123,15 +121,16 @@ rm -rf $RPM_BUILD_ROOT
%files devel %defattr(-,root,root,-) -%exclude %{_bindir}/lqt-config %{_includedir}/lqt/ %{_libdir}/pkgconfig/libquicktime.pc %{_libdir}/%{name}*.so -%{_datadir}/aclocal/lqt.m4
# --------------------------------------------------------------------
%changelog +* Fri Jan 21 2011 Nicolas Chauvet kwizart@gmail.com - 1.2.2-1 +- Update to 1.2.2 + * Sat Jul 10 2010 Nicolas Chauvet kwizart@gmail.com - 1.1.5-2 - Add libquicktime-1.1.5-gtk.patch from Dan Horák.
diff --git a/sources b/sources index 09ad913..8ca0f06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fd45b3deff0317c2f85a34b1b106acf libquicktime-1.1.5.tar.gz +016a0513a7d3fb1b8e64a265152e559d libquicktime-1.2.2.tar.gz
commit 73e8be63ae957236cf2d8dc2d93cea653fd9da75 Author: Nicolas Chauvet kwizart@gmail.com Date: Sat Jul 10 15:18:48 2010 +0000
Add patch from Dan Horák for newer gtk
diff --git a/libquicktime-1.1.5-gtk.patch b/libquicktime-1.1.5-gtk.patch new file mode 100644 index 0000000..ae573af --- /dev/null +++ b/libquicktime-1.1.5-gtk.patch @@ -0,0 +1,39 @@ +diff -up libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk libquicktime-1.1.5/utils/gtk/libquicktime_config.c +--- libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk 2010-07-08 12:21:24.000000000 +0200 ++++ libquicktime-1.1.5/utils/gtk/libquicktime_config.c 2010-07-08 12:22:45.000000000 +0200 +@@ -112,8 +112,8 @@ static MainWindow * create_main_window() + G_CALLBACK(main_window_button_callback), + (gpointer)ret); + +- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); +- GTK_WIDGET_SET_FLAGS (ret->save_button, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->save_button), TRUE); + + gtk_widget_show(ret->close_button); + gtk_widget_show(ret->save_button); +diff -up libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk libquicktime-1.1.5/utils/gtk/lqt_gtk.c +--- libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk 2010-07-08 12:27:26.000000000 +0200 ++++ libquicktime-1.1.5/utils/gtk/lqt_gtk.c 2010-07-08 12:27:04.000000000 +0200 +@@ -941,9 +941,9 @@ lqtgtk_create_codec_config_window(lqt_co + G_CALLBACK(codec_config_window_button_callback), + (gpointer)ret); + +- GTK_WIDGET_SET_FLAGS (ret->apply_button, GTK_CAN_DEFAULT); +- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); +- GTK_WIDGET_SET_FLAGS (ret->restore_button, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->apply_button), TRUE); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->restore_button), TRUE); + + gtk_widget_show(ret->apply_button); + gtk_widget_show(ret->close_button); +@@ -1240,7 +1240,7 @@ lqtgtk_create_codec_info_window(const lq + ret->mainbox = gtk_vbox_new(0, 10); + + ret->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); +- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); + + g_signal_connect(G_OBJECT(ret->close_button), "clicked", + G_CALLBACK(codec_info_window_button_callback), diff --git a/libquicktime.spec b/libquicktime.spec index 49d13a4..a3aa097 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,11 +1,12 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... +Patch0: libquicktime-1.1.5-gtk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel @@ -56,6 +57,7 @@ enhancements. This package contains development files for %{name}.
%prep %setup -q +%patch0 -p1 -b .gtk
# -------------------------------------------------------------------- @@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Sat Jul 10 2010 Nicolas Chauvet kwizart@gmail.com - 1.1.5-2 +- Add libquicktime-1.1.5-gtk.patch from Dan Horák. + * Sat May 01 2010 Nicolas Chauvet kwizart@fedoraproject.org - 1.1.5-1 - Update to 1.1.5
commit fb6ee1783057c5656f485e417e65f63b1476588f Author: Nicolas Chauvet kwizart@gmail.com Date: Sat May 1 17:28:37 2010 +0000
Update to 1.1.5
diff --git a/.gitignore b/.gitignore index 729cd38..872d1e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libquicktime-1.1.4.tar.gz +libquicktime-1.1.5.tar.gz diff --git a/libquicktime.spec b/libquicktime.spec index 26a0653..49d13a4 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime -Version: 1.1.4 -Release: 2%{?dist} +Version: 1.1.5 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -16,6 +16,7 @@ BuildRequires: lame-devel alsa-lib-devel libXt-devel libXaw-devel libXv-devel BuildRequires: libdv-devel >= 0.102-4 x264-devel faad2-devel BuildRequires: libavc1394-devel libraw1394-devel >= 0.9.0-12 BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: schroedinger-devel BuildRequires: gettext-devel %{?_with_faac:BuildRequires: faac-devel}
@@ -129,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Sat May 01 2010 Nicolas Chauvet kwizart@fedoraproject.org - 1.1.5-1 +- Update to 1.1.5 + * Mon Jan 25 2010 Nicolas Chauvet kwizart@fedoraproject.org - 1.1.4-2 - Rebuild
diff --git a/sources b/sources index 652320a..09ad913 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee4f8602e67a445ba906f809a83e0c34 libquicktime-1.1.4.tar.gz +0fd45b3deff0317c2f85a34b1b106acf libquicktime-1.1.5.tar.gz
commit 3ae16e75cdcc6ffd1493d2307b6129fb5b8c9ce1 Author: Nicolas Chauvet kwizart@gmail.com Date: Mon Jan 25 22:12:26 2010 +0000
Rebuild
diff --git a/libquicktime.spec b/libquicktime.spec index 186ab06..26a0653 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.1.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Mon Jan 25 2010 Nicolas Chauvet kwizart@fedoraproject.org - 1.1.4-2 +- Rebuild + * Sat Jan 16 2010 Nicolas Chauvet kwizart@fedoraproject.org - 1.1.4-1 - Update to 1.1.4
commit 4b2dbe9e34aebdb0adab89221af66984bc012e2c Author: Nicolas Chauvet kwizart@gmail.com Date: Sat Jan 16 17:11:57 2010 +0000
-Remove deprecated mmx configure option
diff --git a/libquicktime.spec b/libquicktime.spec index aa98dcf..186ab06 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -68,12 +68,7 @@ enhancements. This package contains development files for %{name}. --without-doxygen \ --disable-static \ --with-libdv \ - --enable-libswscale \ -%ifarch i686 pentium3 pentium4 athlon x86_64 ia64 - --enable-mmx \ -%else - --disable-mmx -%endif + --enable-libswscale
# remove rpath from libtool sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
commit e44f917206179f7e6cfc704cbe84ea1524df84e7 Author: Nicolas Chauvet kwizart@gmail.com Date: Sat Jan 16 16:43:22 2010 +0000
Update to 1.1.4
diff --git a/.gitignore b/.gitignore index e0ef3c3..729cd38 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libquicktime-1.1.3.tar.gz +libquicktime-1.1.4.tar.gz diff --git a/libquicktime-1.1.3-x264_b78.patch b/libquicktime-1.1.3-x264_b78.patch deleted file mode 100644 index 6a773aa..0000000 --- a/libquicktime-1.1.3-x264_b78.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -up libquicktime-1.1.3/plugins/x264/lqt_x264.c.b78 libquicktime-1.1.3/plugins/x264/lqt_x264.c ---- libquicktime-1.1.3/plugins/x264/lqt_x264.c.b78 2008-12-06 15:03:10.000000000 +0100 -+++ libquicktime-1.1.3/plugins/x264/lqt_x264.c 2009-10-27 22:44:02.792431855 +0100 -@@ -94,6 +94,17 @@ static lqt_parameter_info_static_t encod - .val_max = { .val_int = 100 }, - .help_string = TRS("Influences how often B-frames are used"), - }, -+#if X264_BUILD >= 78 -+ { -+ .name = "x264_i_bframe_pyramid", -+ .real_name = TRS("B-frame pyramid"), -+ .type = LQT_PARAMETER_INT, -+ .val_default = { .val_int = 0 }, -+ .val_min = { .val_int = 0 }, -+ .val_max = { .val_int = 2 }, -+ .help_string = TRS("Keep some B-frames as references") -+ }, -+#else - { - .name = "x264_b_bframe_pyramid", - .real_name = TRS("B-frame pyramid"), -@@ -103,6 +114,7 @@ static lqt_parameter_info_static_t encod - .val_max = { .val_int = 1 }, - .help_string = TRS("Keep some B-frames as references") - }, -+#endif - { - .name = "x264_ratecontrol", - .real_name = TRS("Ratecontrol"), -@@ -537,3 +549,4 @@ LQT_EXTERN lqt_init_video_codec_func_t g - } - return (lqt_init_video_codec_func_t)0; - } -+ -diff -up libquicktime-1.1.3/plugins/x264/x264.c.b78 libquicktime-1.1.3/plugins/x264/x264.c ---- libquicktime-1.1.3/plugins/x264/x264.c.b78 2009-03-11 15:25:50.000000000 +0100 -+++ libquicktime-1.1.3/plugins/x264/x264.c 2009-10-27 22:44:14.134432973 +0100 -@@ -67,7 +67,11 @@ static void dump_params(x264_param_t * p - lqt_dump(" i_bframe: %d\n", params->i_bframe); // 0.. X264_BFRAME_MAX - lqt_dump(" b_bframe_adaptive: %d\n", params->b_bframe_adaptive); - lqt_dump(" i_bframe_bias: %d\n", params->i_bframe_bias); -+#if X264_BUILD >= 78 -+ lqt_dump(" i_bframe_pyramid: %d\n", params->i_bframe_pyramid); -+#else - lqt_dump(" b_bframe_pyramid: %d\n", params->b_bframe_pyramid); -+#endif - - lqt_dump(" b_deblocking_filter: %d\n", params->b_deblocking_filter); - lqt_dump(" i_deblocking_filter_alphac0: %d\n", params->i_deblocking_filter_alphac0); // -6..6 -@@ -174,14 +178,21 @@ encode_nals(uint8_t *buf, int size, x264 - { - uint8_t *p = buf; - int i; -+#if X264_BUILD < 76 - int s; -+#endif - - for(i = 0; i < nnal; i++) - { -+#if X264_BUILD >= 76 -+ memcpy(p, nals[i].p_payload, nals[i].i_payload); -+ p+=nals[i].i_payload; -+#else - s = x264_nal_encode(p, &size, 1, nals + i); - if(s < 0) - return -1; - p += s; -+#endif - } - - return p - buf; -@@ -407,7 +418,11 @@ static int flush_frame(quicktime_t *file - - pic_out.i_pts = 0; - /* Encode frames, get nals */ -+#if X264_BUILD >= 76 -+ if(x264_encoder_encode(codec->enc, &nal, &nnal, pic_in, &pic_out)<0) -+#else - if(x264_encoder_encode(codec->enc, &nal, &nnal, pic_in, &pic_out)) -+#endif - return 0; - - /* Encode nals -> get h264 stream */ -@@ -782,7 +797,11 @@ static int set_parameter(quicktime_t *fi - ENUMPARAM("x264_i_bframe_adaptive", codec->params.i_bframe_adaptive, bframe_adaptives); - #endif - INTPARAM("x264_i_bframe_bias", codec->params.i_bframe_bias); -+#if X264_BUILD >= 78 -+ INTPARAM("x264_i_bframe_pyramid", codec->params.i_bframe_pyramid); -+#else - INTPARAM("x264_b_bframe_pyramid", codec->params.b_bframe_pyramid); -+#endif - - ENUMPARAM("x264_i_rc_method", codec->params.rc.i_rc_method, rc_methods); - INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate); -@@ -921,3 +940,4 @@ void quicktime_init_codec_x264(quicktime - x264_param_default(&(codec->params)); - } - -+ diff --git a/libquicktime.spec b/libquicktime.spec index 6b85e1b..aa98dcf 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,12 +1,11 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime -Version: 1.1.3 -Release: 3%{?dist} +Version: 1.1.4 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... -Patch0: libquicktime-1.1.3-x264_b78.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel @@ -56,7 +55,7 @@ enhancements. This package contains development files for %{name}.
%prep %setup -q -%patch0 -p1 -b .b78 +
# --------------------------------------------------------------------
@@ -135,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Sat Jan 16 2010 Nicolas Chauvet kwizart@fedoraproject.org - 1.1.4-1 +- Update to 1.1.4 + * Fri Oct 30 2009 kwizart <kwizart at gmail.com > - 1.1.3-3 - Add BR schroedinger-devel
diff --git a/sources b/sources index a634ab8..652320a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4fcda219f1e0ca508d9baa3700e4a59 libquicktime-1.1.3.tar.gz +ee4f8602e67a445ba906f809a83e0c34 libquicktime-1.1.4.tar.gz
commit fb8819c040c84fafa2dd1f7cba9355ff33e55738 Author: Nicolas Chauvet kwizart@gmail.com Date: Fri Oct 30 07:38:01 2009 +0000
- Add BR schroedinger-devel
diff --git a/libquicktime.spec b/libquicktime.spec index b3f1a8d..6b85e1b 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libdv-devel BuildRequires: libpng-devel libjpeg-devel libGLU-devel BuildRequires: libvorbis-devel ffmpeg-devel +BuildRequires: schroedinger-devel BuildRequires: lame-devel alsa-lib-devel libXt-devel libXaw-devel libXv-devel BuildRequires: libdv-devel >= 0.102-4 x264-devel faad2-devel BuildRequires: libavc1394-devel libraw1394-devel >= 0.9.0-12 @@ -134,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Fri Oct 30 2009 kwizart <kwizart at gmail.com > - 1.1.3-3 +- Add BR schroedinger-devel + * Tue Oct 27 2009 kwizart <kwizart at gmail.com > - 1.1.3-2 - backport patch from Alexis Ballier.
commit 7f93aba5ae15f4fd91a3144dd3be658ac924fcf5 Author: Nicolas Chauvet kwizart@gmail.com Date: Tue Oct 27 21:52:54 2009 +0000
- backport patch from Alexis Ballier.
diff --git a/libquicktime-1.1.3-x264_b78.patch b/libquicktime-1.1.3-x264_b78.patch new file mode 100644 index 0000000..6a773aa --- /dev/null +++ b/libquicktime-1.1.3-x264_b78.patch @@ -0,0 +1,100 @@ +diff -up libquicktime-1.1.3/plugins/x264/lqt_x264.c.b78 libquicktime-1.1.3/plugins/x264/lqt_x264.c +--- libquicktime-1.1.3/plugins/x264/lqt_x264.c.b78 2008-12-06 15:03:10.000000000 +0100 ++++ libquicktime-1.1.3/plugins/x264/lqt_x264.c 2009-10-27 22:44:02.792431855 +0100 +@@ -94,6 +94,17 @@ static lqt_parameter_info_static_t encod + .val_max = { .val_int = 100 }, + .help_string = TRS("Influences how often B-frames are used"), + }, ++#if X264_BUILD >= 78 ++ { ++ .name = "x264_i_bframe_pyramid", ++ .real_name = TRS("B-frame pyramid"), ++ .type = LQT_PARAMETER_INT, ++ .val_default = { .val_int = 0 }, ++ .val_min = { .val_int = 0 }, ++ .val_max = { .val_int = 2 }, ++ .help_string = TRS("Keep some B-frames as references") ++ }, ++#else + { + .name = "x264_b_bframe_pyramid", + .real_name = TRS("B-frame pyramid"), +@@ -103,6 +114,7 @@ static lqt_parameter_info_static_t encod + .val_max = { .val_int = 1 }, + .help_string = TRS("Keep some B-frames as references") + }, ++#endif + { + .name = "x264_ratecontrol", + .real_name = TRS("Ratecontrol"), +@@ -537,3 +549,4 @@ LQT_EXTERN lqt_init_video_codec_func_t g + } + return (lqt_init_video_codec_func_t)0; + } ++ +diff -up libquicktime-1.1.3/plugins/x264/x264.c.b78 libquicktime-1.1.3/plugins/x264/x264.c +--- libquicktime-1.1.3/plugins/x264/x264.c.b78 2009-03-11 15:25:50.000000000 +0100 ++++ libquicktime-1.1.3/plugins/x264/x264.c 2009-10-27 22:44:14.134432973 +0100 +@@ -67,7 +67,11 @@ static void dump_params(x264_param_t * p + lqt_dump(" i_bframe: %d\n", params->i_bframe); // 0.. X264_BFRAME_MAX + lqt_dump(" b_bframe_adaptive: %d\n", params->b_bframe_adaptive); + lqt_dump(" i_bframe_bias: %d\n", params->i_bframe_bias); ++#if X264_BUILD >= 78 ++ lqt_dump(" i_bframe_pyramid: %d\n", params->i_bframe_pyramid); ++#else + lqt_dump(" b_bframe_pyramid: %d\n", params->b_bframe_pyramid); ++#endif + + lqt_dump(" b_deblocking_filter: %d\n", params->b_deblocking_filter); + lqt_dump(" i_deblocking_filter_alphac0: %d\n", params->i_deblocking_filter_alphac0); // -6..6 +@@ -174,14 +178,21 @@ encode_nals(uint8_t *buf, int size, x264 + { + uint8_t *p = buf; + int i; ++#if X264_BUILD < 76 + int s; ++#endif + + for(i = 0; i < nnal; i++) + { ++#if X264_BUILD >= 76 ++ memcpy(p, nals[i].p_payload, nals[i].i_payload); ++ p+=nals[i].i_payload; ++#else + s = x264_nal_encode(p, &size, 1, nals + i); + if(s < 0) + return -1; + p += s; ++#endif + } + + return p - buf; +@@ -407,7 +418,11 @@ static int flush_frame(quicktime_t *file + + pic_out.i_pts = 0; + /* Encode frames, get nals */ ++#if X264_BUILD >= 76 ++ if(x264_encoder_encode(codec->enc, &nal, &nnal, pic_in, &pic_out)<0) ++#else + if(x264_encoder_encode(codec->enc, &nal, &nnal, pic_in, &pic_out)) ++#endif + return 0; + + /* Encode nals -> get h264 stream */ +@@ -782,7 +797,11 @@ static int set_parameter(quicktime_t *fi + ENUMPARAM("x264_i_bframe_adaptive", codec->params.i_bframe_adaptive, bframe_adaptives); + #endif + INTPARAM("x264_i_bframe_bias", codec->params.i_bframe_bias); ++#if X264_BUILD >= 78 ++ INTPARAM("x264_i_bframe_pyramid", codec->params.i_bframe_pyramid); ++#else + INTPARAM("x264_b_bframe_pyramid", codec->params.b_bframe_pyramid); ++#endif + + ENUMPARAM("x264_i_rc_method", codec->params.rc.i_rc_method, rc_methods); + INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate); +@@ -921,3 +940,4 @@ void quicktime_init_codec_x264(quicktime + x264_param_default(&(codec->params)); + } + ++ diff --git a/libquicktime.spec b/libquicktime.spec index 7b95733..b3f1a8d 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,11 +1,12 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... +Patch0: libquicktime-1.1.3-x264_b78.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel @@ -54,6 +55,7 @@ enhancements. This package contains development files for %{name}.
%prep %setup -q +%patch0 -p1 -b .b78
# --------------------------------------------------------------------
@@ -132,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Tue Oct 27 2009 kwizart <kwizart at gmail.com > - 1.1.3-2 +- backport patch from Alexis Ballier. + * Thu Oct 15 2009 kwizart <kwizart at gmail.com > - 1.1.3-1 - Update to 1.1.3 - Conditionalize faac
commit d2df5916eba3da1d73c7c5cda0c2e03c02247bc0 Author: Nicolas Chauvet kwizart@gmail.com Date: Fri Oct 16 05:55:05 2009 +0000
- Conditionalize faac
diff --git a/libquicktime.spec b/libquicktime.spec index 492be30..7b95733 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -12,10 +12,11 @@ BuildRequires: libdv-devel BuildRequires: libpng-devel libjpeg-devel libGLU-devel BuildRequires: libvorbis-devel ffmpeg-devel BuildRequires: lame-devel alsa-lib-devel libXt-devel libXaw-devel libXv-devel -BuildRequires: libdv-devel >= 0.102-4 x264-devel faac-devel faad2-devel +BuildRequires: libdv-devel >= 0.102-4 x264-devel faad2-devel BuildRequires: libavc1394-devel libraw1394-devel >= 0.9.0-12 BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: gettext-devel +%{?_with_faac:BuildRequires: faac-devel}
%package utils Summary: Utilities for working with Quicktime files @@ -131,8 +132,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog -* Wed Oct 7 2009 kwizart <kwizart at gmail.com > - 1.1.3-1 +* Thu Oct 15 2009 kwizart <kwizart at gmail.com > - 1.1.3-1 - Update to 1.1.3 +- Conditionalize faac
* Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 1.1.1-2 - Rebuild for faad x264
commit 3fc95ed9bd73bc7416f987b6268e1353f04403d6 Author: Nicolas Chauvet kwizart@gmail.com Date: Wed Oct 7 22:55:30 2009 +0000
Update to 1.1.3
diff --git a/.gitignore b/.gitignore index 1d8964b..e0ef3c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libquicktime-1.1.1.tar.gz +libquicktime-1.1.3.tar.gz diff --git a/libquicktime.spec b/libquicktime.spec index a170f16..492be30 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Wed Oct 7 2009 kwizart <kwizart at gmail.com > - 1.1.3-1 +- Update to 1.1.3 + * Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 1.1.1-2 - Rebuild for faad x264
diff --git a/sources b/sources index 5e358d8..a634ab8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88df838a450b6c6768819d45bacc0926 libquicktime-1.1.1.tar.gz +e4fcda219f1e0ca508d9baa3700e4a59 libquicktime-1.1.3.tar.gz
commit 34d1d96709348b298e255004e37e3c75da6c7228 Author: Nicolas Chauvet kwizart@gmail.com Date: Fri Mar 27 15:07:01 2009 +0000
Rebuild for faad2 x264
diff --git a/libquicktime.spec b/libquicktime.spec index 2c07ed6..a170f16 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 1.1.1-2 +- Rebuild for faad x264 + * Sun Dec 28 2008 kwizart <kwizart at gmail.com> - 1.1.1-1 - Update to 1.1.1 - Disable lqt-config (Fix RPM Fusion #265 )
commit 3679d218245cb0f32294f95f133b0805147378a5 Author: Nicolas Chauvet kwizart@gmail.com Date: Mon Mar 23 23:31:02 2009 +0000
Fix
diff --git a/libquicktime.spec b/libquicktime.spec index 100f4a1..2c07ed6 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -16,7 +16,6 @@ BuildRequires: libdv-devel >= 0.102-4 x264-devel faac-devel faad2-devel BuildRequires: libavc1394-devel libraw1394-devel >= 0.9.0-12 BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: gettext-devel -BuildRequires: libtool
%package utils Summary: Utilities for working with Quicktime files @@ -54,8 +53,6 @@ enhancements. This package contains development files for %{name}.
%prep %setup -q -# regenerate configure to disable rpath -autoreconf -f -i
# --------------------------------------------------------------------
@@ -75,6 +72,10 @@ autoreconf -f -i --disable-mmx %endif
+# remove rpath from libtool +sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make %{?_smp_mflags}
# --------------------------------------------------------------------
commit bcaf4b11fe2fe6ae3c54eff17a8bb3ef294b9ee1 Author: Nicolas Chauvet kwizart@gmail.com Date: Sun Dec 28 10:24:52 2008 +0000
- Disable lqt-config (Fix RPM Fusion #265 )
diff --git a/libquicktime.spec b/libquicktime.spec index 958f550..100f4a1 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -121,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel %defattr(-,root,root,-) -%{_bindir}/lqt-config +%exclude %{_bindir}/lqt-config %{_includedir}/lqt/ %{_libdir}/pkgconfig/libquicktime.pc %{_libdir}/%{name}*.so @@ -132,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sun Dec 28 2008 kwizart <kwizart at gmail.com> - 1.1.1-1 - Update to 1.1.1 +- Disable lqt-config (Fix RPM Fusion #265 )
* Thu Dec 4 2008 kwizart <kwizart at gmail.com> - 1.1.0-1 - Update to 1.1.0
commit 618f9fbcbbea851a12bca33f61392bc7a1c8fe06 Author: Nicolas Chauvet kwizart@gmail.com Date: Sun Dec 28 10:13:06 2008 +0000
Update to 1.1.1
diff --git a/.gitignore b/.gitignore index f2bb5c8..1d8964b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libquicktime-1.1.0.tar.gz +libquicktime-1.1.1.tar.gz diff --git a/libquicktime.spec b/libquicktime.spec index cf3c7dd..958f550 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime -Version: 1.1.0 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -130,8 +130,8 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog -* Sat Dec 20 2008 Dominik Mierzejewski rpm@greysector.net - 1.1.0-2 -- rebuild for new ffmpeg +* Sun Dec 28 2008 kwizart <kwizart at gmail.com> - 1.1.1-1 +- Update to 1.1.1
* Thu Dec 4 2008 kwizart <kwizart at gmail.com> - 1.1.0-1 - Update to 1.1.0 diff --git a/sources b/sources index 53bad1c..5e358d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ea07d22a8734f8590efd5e341e6a072 libquicktime-1.1.0.tar.gz +88df838a450b6c6768819d45bacc0926 libquicktime-1.1.1.tar.gz
commit a85b4e68294b622b56c3edbf939ca26eff0c7484 Author: Dominik Mierzejewski dominik@greysector.net Date: Sat Dec 20 20:10:18 2008 +0000
* Sat Dec 20 2008 Dominik Mierzejewski rpm@greysector.net - 1.1.0-2 - rebuild for new ffmpeg
diff --git a/libquicktime.spec b/libquicktime.spec index c565c6a..cf3c7dd 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Sat Dec 20 2008 Dominik Mierzejewski rpm@greysector.net - 1.1.0-2 +- rebuild for new ffmpeg + * Thu Dec 4 2008 kwizart <kwizart at gmail.com> - 1.1.0-1 - Update to 1.1.0
commit 998b08b2f5c85f94dba421e4aa2ac1fb781246d6 Author: Nicolas Chauvet kwizart@gmail.com Date: Thu Dec 4 23:08:49 2008 +0000
Fix wrong macro
diff --git a/libquicktime.spec b/libquicktime.spec index 8614e4c..c565c6a 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -69,7 +69,7 @@ autoreconf -f -i --disable-static \ --with-libdv \ --enable-libswscale \ -%ifarch %{ix86} x86_64 ia64 +%ifarch i686 pentium3 pentium4 athlon x86_64 ia64 --enable-mmx \ %else --disable-mmx
commit 9b28b9ade97821a21dd9399aef48c5e25e34f60d Author: Nicolas Chauvet kwizart@gmail.com Date: Thu Dec 4 22:55:44 2008 +0000
- Update to 1.1.0
diff --git a/.gitignore b/.gitignore index 6c333e8..f2bb5c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libquicktime-1.0.3.tar.gz +libquicktime-1.1.0.tar.gz diff --git a/libquicktime.spec b/libquicktime.spec index afa8b32..8614e4c 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime -Version: 1.0.3 -Release: 4%{?dist} +Version: 1.1.0 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -69,7 +69,7 @@ autoreconf -f -i --disable-static \ --with-libdv \ --enable-libswscale \ -%ifarch i686 athlon pentium3 pentium4 x86_64 ia64 +%ifarch %{ix86} x86_64 ia64 --enable-mmx \ %else --disable-mmx @@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Thu Dec 4 2008 kwizart <kwizart at gmail.com> - 1.1.0-1 +- Update to 1.1.0 + * Mon Sep 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0.3-4 - rebuild for new x264
diff --git a/sources b/sources index ec1d4ff..53bad1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -823191104cdd665c75d447c8f5f8bf7e libquicktime-1.0.3.tar.gz +8ea07d22a8734f8590efd5e341e6a072 libquicktime-1.1.0.tar.gz
commit 6f8d2aba4ec139f665cfdcf473f3b68f04980816 Author: Thorsten Leemhuis fedora@leemhuis.info Date: Mon Sep 8 13:50:13 2008 +0000
* Mon Sep 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0.3-4 - rebuild for new x264
diff --git a/libquicktime.spec b/libquicktime.spec index 27be8ef..afa8b32 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------
%changelog +* Mon Sep 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0.3-4 +- rebuild for new x264 + * Fri Aug 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0.3-3 - rebuild
commit 433eb26597612f6b1c895f7db5cd13e2545756a2 Author: Thorsten Leemhuis fedora@leemhuis.info Date: Fri Aug 8 18:13:13 2008 +0000
initial import from livna
diff --git a/.gitignore b/.gitignore index e69de29..6c333e8 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +libquicktime-1.0.3.tar.gz diff --git a/libquicktime.spec b/libquicktime.spec new file mode 100644 index 0000000..27be8ef --- /dev/null +++ b/libquicktime.spec @@ -0,0 +1,279 @@ +Summary: Library for reading and writing Quicktime files +Name: libquicktime +Version: 1.0.3 +Release: 3%{?dist} +License: LGPLv2+ +Group: System Environment/Libraries +URL: http://libquicktime.sourceforge.net/ +Source0: http://downloads.sourceforge.net/libquicktime/%%7Bname%7D-%%7Bversion%7D.tar... +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libdv-devel +BuildRequires: libpng-devel libjpeg-devel libGLU-devel +BuildRequires: libvorbis-devel ffmpeg-devel +BuildRequires: lame-devel alsa-lib-devel libXt-devel libXaw-devel libXv-devel +BuildRequires: libdv-devel >= 0.102-4 x264-devel faac-devel faad2-devel +BuildRequires: libavc1394-devel libraw1394-devel >= 0.9.0-12 +BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: gettext-devel +BuildRequires: libtool + +%package utils +Summary: Utilities for working with Quicktime files +Group: Applications/Multimedia + +%package devel +Summary: Development files for libquicktime +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} zlib-devel pkgconfig + +# -------------------------------------------------------------------- + +%description +Libquicktime is based on the quicktime4linux library with several +enhancements. All 3rd-party libraries were removed from the +sourcetree. Instead, the systemwide installed libraries are detected +by the configure script. All original codecs were moved into +dynamically loadable modules, and new codecs are in +development. Libquicktime is source-compatible with +quicktime4linux. Special API extensions allow access to the codec +registry and more convenient processing of Audio and Video +data. + +%description utils +Libquicktime is based on the quicktime4linux library with several +enhancements. This package contains utility programs and additional +tools, like a commandline player and a GTK configuration utility which +can configure the parameters of all installed codecs. + +%description devel +Libquicktime is based on the quicktime4linux library with several +enhancements. This package contains development files for %{name}. + +# -------------------------------------------------------------------- + +%prep +%setup -q +# regenerate configure to disable rpath +autoreconf -f -i + +# -------------------------------------------------------------------- + +%build +%configure \ + --enable-gpl \ + --disable-rpath \ + --with-cpuflags="$RPM_OPT_FLAGS" \ + --disable-dependency-tracking \ + --without-doxygen \ + --disable-static \ + --with-libdv \ + --enable-libswscale \ +%ifarch i686 athlon pentium3 pentium4 x86_64 ia64 + --enable-mmx \ +%else + --disable-mmx +%endif + +make %{?_smp_mflags} + +# -------------------------------------------------------------------- + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +find $RPM_BUILD_ROOT%{_libdir} -type f -a -name *.la -exec rm {} ; + + +%find_lang %{name} + + +# -------------------------------------------------------------------- + +%clean +rm -rf $RPM_BUILD_ROOT + +# -------------------------------------------------------------------- + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc COPYING README TODO +%{_libdir}/%{name}*.so.* +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/lqt_*.so + +%files utils +%defattr(-,root,root,-) +%{_bindir}/libquicktime_config +%{_bindir}/lqt_transcode +%{_bindir}/lqtplay +%{_bindir}/qt2text +%{_bindir}/qtdechunk +%{_bindir}/qtdump +%{_bindir}/qtinfo +%{_bindir}/qtrechunk +%{_bindir}/qtstreamize +%{_bindir}/qtyuv4toyuv +%{_mandir}/man1/lqtplay.1* + +%files devel +%defattr(-,root,root,-) +%{_bindir}/lqt-config +%{_includedir}/lqt/ +%{_libdir}/pkgconfig/libquicktime.pc +%{_libdir}/%{name}*.so +%{_datadir}/aclocal/lqt.m4 + +# -------------------------------------------------------------------- + +%changelog +* Fri Aug 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0.3-3 +- rebuild + +* Thu Jul 17 2008 kwizart <kwizart at gmail.com> - 1.0.3-2 +- Add BR libdv-devel and --with-dv + +* Thu Jul 17 2008 kwizart <kwizart at gmail.com> - 1.0.3-1 +- Update to 1.0.3 + +* Sat Jun 14 2008 kwizart <kwizart at gmail.com> - 1.0.2-3 +- Enable libswscale + +* Thu Feb 28 2008 kwizart <kwizart at gmail.com> - 1.0.2-2 +- Rebuild for gcc43 and x264 + +* Sun Jan 13 2008 kwizart <kwizart at gmail.com> - 1.0.2-1 +- Update to 1.0.2 (gcc43 compliant) + +* Mon Oct 15 2007 kwizart <kwizart at gmail.com> - 1.0.1-1 +- Update to 1.0.1 +- Disable libswscale (disabled in ffmpeg). + +* Wed Sep 26 2007 kwizart <kwizart at gmail.com> - 1.0.0-2 +- Fix build for new tooltip with gtk 2.12 + A better patch may need: + http://library.gnome.org/devel/gtk/unstable/gtk-migrating-tooltips.html + +* Thu Jul 5 2007 kwizart <kwizart at gmail.com> - 1.0.0-1 +- Update to 1.0.0 +- Add BR gettext, libtool +- re-Run autogen.sh to prevent rpath issues... +- add patch from freshrpms. + +* Fri Jan 5 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9.10-4 +- Drop old ffmpeg (main) package dependency. +- Improve summary. + +* Wed Nov 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.10-3 +- Enable GPL plugins, x264 patch borrowed from freshrpms. +- Split utilities into -utils subpackage. + +* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.9.10-2 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Sun Sep 24 2006 Dams <anvil[AT]livna.org> - 0.9.10-1 +- Disabled some standard library paths in rpath with Ville help +- Explicitly disabling static objects building + +* Wed Sep 20 2006 Dams <anvil[AT]livna.org> - 0.9.10-1 +- Updated to 0.9.10 + +* Sat Apr 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.8-1 +- 0.9.8. + +* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> +- switch to new release field + +* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> +- add dist + +* Thu Jan 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.7-0.lvn.9 +- Rebuild against new ffmpeg. +- Drop no longer needed modular X build dep workarounds. + +* Thu Dec 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.7-0.lvn.8 +- Adapt to modular X11. +- Drop unneeded GTK1 build dependencies, BuildRequire fixed libdv-devel. +- Drop zero Epochs. + +* Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0:0.9.7-0.lvn.7 +- More clean-up for obsolete pre-FC2 support + +* Tue Aug 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.7-0.lvn.6 +- Quick hack to fix libavcodec detection with newer (>= 20050731) ffmpegs. +- Don't ship static libs. + +* Mon Jul 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.7-0.lvn.5 +- Clean up obsolete pre-FC2 support. + +* Thu Jun 16 2005 Dams <anvil[AT]livna.org> - 0:0.9.7-0.lvn.4 +- .... and gtk+-devel. + +* Thu Jun 16 2005 Dams <anvil[AT]livna.org> - 0:0.9.7-0.lvn.3 +- libdv-devel needs glib-devel (fedora core bug....) + +* Mon Jun 13 2005 Dams <anvil[AT]livna.org> - 0:0.9.7-0.lvn.2 +- Updated tarball + +* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.7-0.lvn.1 +- 0.9.7, MMX builds with gcc4 again. + +* Sat May 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.6-0.lvn.1 +- 0.9.6, aclocal18 patch applied upstream. +- Patch to compile with gcc4 (MMX build is borked though, build --without mmx). +- Use "make install DESTDIR=..." to avoid nasty rpaths. + +* Thu Sep 2 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.3-0.lvn.2 +- Make dv support conditional (default on), add minimum required libdv version. +- Make firewire support conditional again (only if dv support is available). +- Disable dependency tracking to speed up the build. +- Fix aclocal >= 1.8 warnings from lqt.m4. +- BuildRequire %%{_libdir}/libGLU.so.1. + +* Mon Aug 30 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.3-0.lvn.1 +- Update to 0.9.3. +- Enable ffmpeg plugin. +- Make firewire support unconditional. +- Fix 64bit libdir. +- Fix -devel dependencies. +- Update list of archs with MMX. +- Clean up list of docs. + +* Tue Apr 6 2004 Dams <anvil[AT]livna.org> 0:0.9.2-0.lvn.2 +- BuildConflicts libraw1394 0.10.0 to prevent surprises. + +* Tue Apr 6 2004 Dams <anvil[AT]livna.org> 0:0.9.2-0.lvn.1 +- Conditionnal firewire stuff rewriten + +* Wed Mar 10 2004 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.1 +- Updated to final 0.9.2 release +- firewire now default enabled + +* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.7.pre1 +- Removed comment after scriptlets + +* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.6.pre1 +- Without firewire BuildConflicts with libdv/libavc1394/libraw1394-devel + +* Mon Jul 14 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.5.pre1 +- Added missing deps for ffmpeg-devel +- Added build option "with firewire" (disabled by default) + +* Wed Jul 9 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.4.pre1 +- Added missing unowned directory +- Removed URL in Source0 +- buildroot -> RPM_BUILD_ROOT +- athlon is mmx compliant too +- Now include all *.so/*.so.*/.a in libdir (bug #451) + +* Wed Apr 23 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.3.pre1 +- Typo in group tag + +* Mon Apr 21 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.2.pre1 +- Major fix from from Diag (plugins are now in the package). + +* Wed Apr 16 2003 Dams <anvil[AT]livna.org> +- Initial build. diff --git a/sources b/sources index e69de29..ec1d4ff 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +823191104cdd665c75d447c8f5f8bf7e libquicktime-1.0.3.tar.gz