[gstreamer-plugins-ugly] Fix FTBFS
by Nicolas Chauvet
commit dda07ae7d4ee82e33cf083987423f73afaea3842
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Sat May 21 12:08:31 2016 +0200
Fix FTBFS
- Prune changelog
0002-fix-build-with-new-gtkdoc.patch | 18 ++
gstreamer-plugins-ugly.spec | 406 +----------------------------------
2 files changed, 27 insertions(+), 397 deletions(-)
---
diff --git a/0002-fix-build-with-new-gtkdoc.patch b/0002-fix-build-with-new-gtkdoc.patch
new file mode 100644
index 0000000..34dae3f
--- /dev/null
+++ b/0002-fix-build-with-new-gtkdoc.patch
@@ -0,0 +1,18 @@
+Fix Building with GTK-Doc >= 1.25
+
+GTK-Doc >= 1.25 No longer generates index.sgml files, so do not try
+to fix them up.
+
+diff -up gst-plugins-ugly-0.10.19/docs/plugins/Makefile.in~ gst-plugins-ugly-0.10.19/docs/plugins/Makefile.in
+--- gst-plugins-ugly-0.10.19/docs/plugins/Makefile.in~ 2012-02-21 02:06:11.000000000 +0100
++++ gst-plugins-ugly-0.10.19/docs/plugins/Makefile.in 2016-05-21 12:00:59.085435822 +0200
+@@ -917,9 +917,6 @@ update:
+ @ENABLE_GTK_DOC_TRUE@ fi; \
+ @ENABLE_GTK_DOC_TRUE@ fi; \
+ @ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
+-@ENABLE_GTK_DOC_TRUE@ @mv html/index.sgml html/index.sgml.bak
+-@ENABLE_GTK_DOC_TRUE@ @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
+-@ENABLE_GTK_DOC_TRUE@ @rm -f html/index.sgml.bak
+ @ENABLE_GTK_DOC_TRUE@ @rm -f html/$(DOC_MAIN_SGML_FILE)
+ @ENABLE_GTK_DOC_TRUE@ @rm -rf html/xml
+ @ENABLE_GTK_DOC_TRUE@ @rm -f html/version.entities
diff --git a/gstreamer-plugins-ugly.spec b/gstreamer-plugins-ugly.spec
index 1703f6a..5b55d50 100644
--- a/gstreamer-plugins-ugly.spec
+++ b/gstreamer-plugins-ugly.spec
@@ -11,12 +11,13 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.19
-Release: 18%{?dist}
+Release: 19%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
Source: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{...
Patch1: 0001-new-libcdio.patch
+Patch2: 0002-fix-build-with-new-gtkdoc.patch
Requires: %{gstreamer} >= %{gst_minver}
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
@@ -77,6 +78,7 @@ be shipped in gstreamer-plugins-good because:
%prep
%setup -q -n gst-plugins-ugly-%{version}
%patch1 -p1
+%patch2 -p1
%build
@@ -98,7 +100,8 @@ be shipped in gstreamer-plugins-good because:
%files -f gst-plugins-ugly-%{majorminor}.lang
-%doc AUTHORS COPYING README REQUIREMENTS
+%doc AUTHORS README REQUIREMENTS
+%license COPYING
%{_datadir}/gstreamer-%{majorminor}
# Plugins without external dependencies
%{_libdir}/gstreamer-%{majorminor}/libgstasf.so
@@ -128,6 +131,10 @@ be shipped in gstreamer-plugins-good because:
%changelog
+* Sat May 21 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.19-19
+- Fix FTBFS
+- Prune changelog
+
* Mon Sep 01 2014 Sérgio Basto <sergio(a)serjux.com> - 0.10.19-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -217,398 +224,3 @@ be shipped in gstreamer-plugins-good because:
- Temporarily boost mp3parse element rank so that it gets prefered
over the new (and buggy) mpegaudioparse element from
gstreamer-plugins-bad-free (gnome#641047)
-
-* Fri Oct 15 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.16-2
-- Rebuilt for gcc bug
-
-* Sun Sep 12 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.16-1
-- New upstream release 0.10.15
-
-* Sat Jul 17 2010 Hans de Goede <j.w.r.degoede(a)gmail.com> 0.10.15-2
-- Rebuild for new x264
-- Make devel-docs subpackage noarch (rf#1310)
-
-* Sun Jun 13 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.15-1
-- New upstream release 0.10.15
-
-* Sat May 29 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.14-2
-- Rebuild for new libx264 (rfbz#1235)
-- Build and package gtk-doc (rbfz#1213)
-
-* Sun Mar 14 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.14-1
-- New upstream release 0.10.14
-
-* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.13-2
-- Rebuild for new libcdio and new x264
-
-* Sat Nov 7 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.13-1
-- New upstream release 0.10.13
-
-* Fri Nov 06 2009 Dominik Mierzejewski <rpm(a)greysector.net> - 0.10.12-4
-- Fix compilation against current x264
-
-* Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.10.12-3
-- rebuilt
-
-* Tue Aug 11 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.12-2
-- Add patch which adds amrnb / amrwb decoding using opencore-amr
-
-* Fri Jun 19 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.12-1
-- New upstream release 0.10.12
-
-* Wed Jun 17 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.11-2
-- Rebuild for changes in the gstreamer provides script
-
-* Sun Mar 22 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.11-1
-- New upstream release 0.10.11
-
-* Sun Jan 25 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.10-5
-- Rebase asfdemux patches too latest upstream git
-
-* Fri Jan 23 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.10-4
-- Patch asfdemux plugin to properly handle seeking with push based sources
-
-* Wed Jan 21 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.10-3
-- Rebuild for new libcdio (rpmfusion 335)
-
-* Mon Dec 29 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.10-2
-- Take a stab at fixing rpmfusion bug 282
-
-* Wed Dec 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.10-1
-- New upstream release 0.10.10
-- Backport some mpeg2dec crash fixes from CVS
-
-* Tue Nov 4 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.9-2
-- Fix decoding of certain mp3 files (rpmfusion bug 108)
-
-* Sat Sep 14 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.9-1
-- New upstream release 0.10.9
-
-* Fri Aug 15 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.8-3
-- Fix building of dvdread plugin with libdvdread includes rename
-
-* Wed Jul 23 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.8-2
-- Release bump for rpmfusion
-
-* Thu May 22 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.8-1
-- New upstream release 0.10.8
-- Drop upstreamed patches
-
-* Sun Feb 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.7-1
-- New upstream release 0.10.7
-- Drop upstreamed patches
-
-* Tue Dec 18 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.6-5
-- Fix a crash when reading certain DVD's (livna #1770, gnome #358891)
-
-* Sun Dec 9 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.6-4
-- Add patch which makes asf ask its source if it can convert a timestamp
- to a byte offset before doing byte based seeking, this makes mms/mmsh
- seeking (supported in gstreamer-plugins-bad-0.10.5-12) much smoother,
- as gstmmssrc can actually do that
-
-* Mon Nov 26 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.6-3
-- Rebuild for new libdvdread (bz 1738)
-
-* Mon Oct 8 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.6-2
-- Merge livna spec bugfixes into freshrpms spec for rpmfusion:
-- Set release to 2 to be higher as both livna and freshrpms latest release
-- Set package name and origin to rpmfusion
-- Remove amrnb plugin because of licensing issues
-- Update license tag in accordance with new license tag guidelines
-- Add a patch to fix "streaming task paused, reason error (-5)" with certain
- mp3's (livna bug 1625)
-- Build in livna development for testing and for new ffmpeg in livna
-
-* Tue Aug 21 2007 Matthias Saou <http://freshrpms.net/> 0.10.6-1
-- Update to 0.10.6.
-
-* Wed Mar 30 2007 Matthias Saou <http://freshrpms.net/> 0.10.5-2
-- Remove gtk-doc entirely, do devel package too.
-
-* Fri Dec 15 2006 Matthias Saou <http://freshrpms.net/> 0.10.5-1
-- Update to 0.10.5.
-- Remove no longer needed AC3 sound patch.
-
-* Sun Nov 26 2006 Paulo Roma <roma(a)lcg.ufrj.br> 0.10.4-3
-- Patched to fix AC3 sound.
-
-* Tue Oct 17 2006 Matthias Saou <http://freshrpms.net/> 0.10.4-2
-- Include translations which are now built.
-
-* Sun Sep 17 2006 Matthias Saou <http://freshrpms.net/> 0.10.4-1
-- Update to 0.10.4.
-
-* Wed Apr 19 2006 Matthias Saou <http://freshrpms.net/> 0.10.3-1
-- Update to 0.10.3.
-- Remove no longer needed asfdemux fixes patch.
-- Include new dvdsub plugin.
-- Still don't add and include dvdnav plugin, "not stable yet".
-
-* Tue Mar 28 2006 Matthias Saou <http://freshrpms.net/> 0.10.2-2
-- Include backported asfdemux fixes patch from Daniel S. Rogers.
-
-* Wed Feb 22 2006 Matthias Saou <http://freshrpms.net/> 0.10.2-1
-- Update to 0.10.2.
-- Add libgstasf.so.
-- Enable re-added libgstdvdread.so.
-
-* Thu Jan 19 2006 Matthias Saou <http://freshrpms.net/> 0.10.1-1
-- Update to 0.10.1.
-
-* Fri Dec 16 2005 Matthias Saou <http://freshrpms.net/> 0.10.0.1-1
-- Update to CVS snapshot.
-- Enable amrnb support.
-
-* Mon Dec 05 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.10.0-0.gst.1
-- new release
-
-* Thu Dec 01 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.7-0.gst.1
-- new release with 0.10 major/minor
-- added mpegstream
-
-* Sat Nov 12 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- new release
-
-* Tue Oct 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.4-0.gst.1
-- added a52dec plugin
-- new release
-
-* Mon Oct 03 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.3-0.gst.1
-- new release
-- add -devel and -docs
-
-* Fri Sep 02 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- clean out for split into ugly
-
-* Mon Feb 14 2005 Christian Schaller <christian at fluendo dot com>
-- Add vnc plugin
-
-* Wed Jan 19 2005 Christian Schaller <christian at fluendo dot com>
-- add dv1394 plugin
-
-* Wed Dec 22 2004 Christian Schaller <christian at fluendo dot com>
-- Add -plugins- to plugin names
-
-* Thu Dec 9 2004 Christian Schaller <christian a fluendo dot com>
-- Add the mms plugin
-
-* Wed Oct 06 2004 Christian Schaller <christian at fluendo dot com>
-- Add Wim's new mng decoder plugin
-- add shout2 plugin for Zaheer, hope it is correctly done :)
-
-* Wed Sep 29 2004 Christian Schaller <uraeus at gnome dot org>
-- Fix USE statement for V4L2
-
-* Thu Sep 28 2004 Christian Schaller <uraeus at gnome dot org>
-- Remove kio plugin (as it was broken)
-
-* Wed Sep 21 2004 Christian Schaller <uraeus at gnome dot org>
-- Reorganize SPEC to fit better with fedora.us and freshrpms.net packages
-- Make sure gstinterfaces.so is in the package
-- Add all new plugins
-
-* Mon Mar 15 2004 Thomas Vander Stichele <thomas at apestaart dot org>
-- put back media-info
-- add ffmpegcolorspace plugin
-
-* Sun Mar 07 2004 Christian Schaller <Uraeus(a)gnome.org>
-- Remove rm commands for media-info stuff
-- Add libdir/*
-
-* Thu Mar 04 2004 Christian Schaller <Uraeus(a)gnome.org>
-- Add missing gconf schema install in %%post
-
-* Tue Mar 02 2004 Thomas Vander Stichele <thomas at apestaart dot org>
-- Libraries/Multimedia doesn't exist, remove it
-
-* Tue Mar 02 2004 Thomas Vander Stichele <thomas at apestaart dot org>
-- added speex plugin.
-
-* Mon Mar 01 2004 Thomas Vander Stichele <thomas at apestaart dot org>
-- Cleaned up the mess. Could we PLEASE keep this sort of organized and
-- alphabetic for easy lookup ?
-
-* Fri Feb 13 2004 Christian Schaller <Uraeus(a)gnome.org>
-- Added latest new headers
-
-* Wed Jan 21 2004 Christian Schaller <Uraeus(a)gnome.org>
-- added NAS plugin
-- added i18n locale dir
-
-* Fri Jan 16 2004 Christian Schaller <uraeus(a)gnome.org>
-- added libcaca plugin
-- added libgstcolorspace - fixed name of libgsthermescolorspace
-
-* Wed Jan 14 2004 Christian Schaller <uraeus(a)gnome.org>
-- Add gamma plugin
-- Have the pixbuf plugin deleted for now
-
-* Wed Dec 18 2003 Christian Schaller <Uraeus(a)gnome.org>
-- remove gsttagediting.h as it is gone
-- replace it with gst/tag/tag.h
-
-* Sun Nov 23 2003 Christian Schaller <Uraeus(a)gnome.org>
-- Update spec file for latest changes
-- add faad plugin
-
-* Thu Oct 16 2003 Christian Schaller <Uraeus(a)gnome.org>
-- Add new colorbalance and tuner and xoverlay stuff
-- Change name of kde-audio-devel to arts-devel
-
-* Sat Sep 27 2003 Christian Schaller <Uraeus(a)gnome.org>
-- Add majorminor to man page names
-- add navigation lib to package
-
-* Tue Sep 11 2003 Christian Schaller <Uraeus(a)gnome.org>
-- Add -%%{majorminor} to each instance of gst-register
-
-* Tue Aug 19 2003 Christian Schaller <Uraeus(a)Gnome.org>
-- Add new plugins
-
-* Sat Jul 12 2003 Thomas Vander Stichele <thomas at apestaart dot org>
-- move gst/ mpeg plugins to base package
-- remove hermes conditional from snapshot
-- remove one instance of resample plugin
-- fix up silly versioned plugins efence and rmdemux
-
-* Sat Jul 05 2003 Christian Schaller <Uraeus(a)gnome.org>
-- Major overhaul of SPEC file to make it compatible with what Red Hat ships
- as default
-- Probably a little less sexy, but cross-distro SPEC files are a myth anyway
- so making it convenient for RH users wins out
-- Keeping conditionals even with new re-org so that developers building the
- RPMS don't need everything installed
-- Add bunch of obsoletes to ease migration from earlier official GStreamer RPMS
-- Remove plugins that doesn't exist anymore
-
-* Sun Mar 02 2003 Christian Schaller <Uraeus(a)gnome.org>
-- Remove USE_RTP statement from RTP plugin
-- Move RTP plugin to no-deps section
-
-* Sat Mar 01 2003 Christian Schaller <Uraeus(a)gnome.org>
-- Remove videosink from SPEC
-* Thu Jan 23 2003 Thomas Vander Stichele <thomas at apestaart dot org>
-- various fixes
-- make video output packages provide gstreamer-videosink
-
-* Thu Jan 23 2003 Thomas Vander Stichele <thomas at apestaart dot org>
-- split out ffmpeg stuff to separate plugin
-
-* Fri Dec 27 2002 Thomas Vander Stichele <thomas at apestaart dot org>
-- add virtual provides for audio sources and sinks
-
-* Sun Dec 15 2002 Christian Schaller <Uraeus(a)linuxrising.org>
-- Update mpeg2dec REQ to be 0.3.1
-
-* Tue Dec 10 2002 Thomas Vander Stichele <thomas at apestaart dot org>
-- only install schema once
-- move out devel lib stuff to -devel package
-
-* Sun Dec 08 2002 Thomas Vander Stichele <thomas at apestaart dot org>
-- fix location of libgstpng
-- changes for parallel installability
-
-* Thu Nov 28 2002 Christian Schaller <Uraeus(a)linuxrising.org>
-- Put in libgstpng plugin
-- rm the libgstmedia-info stuff until thomas think they are ready
-
-* Fri Nov 01 2002 Thomas Vander Stichele <thomas at apestaart dot org>
-- don't use compprep until ABI issues can be fixed
-
-* Wed Oct 30 2002 Thomas Vander Stichele <thomas at apestaart dot org>
-- added smpte plugin
-- split out dvdnavread package
-- fixed snapshot deps and added hermes conditionals
-
-* Tue Oct 29 2002 Thomas Vander Stichele <thomas at apestaart dot org>
-- added -play package, libs, and .pc files
-
-* Thu Oct 24 2002 Christian Schaller <Uraeus(a)linuxrising.org>
-- Added wavenc to audio formats package
-
-* Sat Oct 20 2002 Christian Scchaller <Uraeus(a)linuxrising.org>
-- Removed all .la files
-- added separate non-openquicktime demuxer plugin
-- added snapshot plugin
-- added videotest plugin
-- Split avi plugin out to avi and windec plugins since aviplugin do not depend on avifile
-- Added cdplayer plugin
-
-* Fri Sep 20 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- added gst-compprep calls
-
-* Wed Sep 18 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- add gst-register-%%{majorminor} calls everywhere again since auto-reregister doesn't work
-- added gstreamer-audio-formats to mad's requires since it needs the typefind
- to work properly
-
-* Mon Sep 9 2002 Christian Schaller <Uraeus(a)linuxrising.org>
-- Added v4l2 plugin
-* Thu Aug 27 2002 Christian Schaller <Uraeus(a)linuxrising.org>
-- Fixed USE_DV_TRUE to USE_LIBDV_TRUE
-- Added Gconf and floatcast headers to gstreamer-plugins-devel package
-- Added mixmatrix plugin to audio-effects package
-
-* Thu Jul 11 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- fixed oss package to buildrequire instead of require glibc headers
-
-* Mon Jul 08 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- fixed -devel package group
-
-* Fri Jul 05 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- release 0.4.0 !
-- added gstreamer-libs.pc
-- removed all gst-register-%%{majorminor} calls since this should be done automatically now
-
-* Thu Jul 04 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- fix issue with SDL package
-- make all packages STRICTLY require the right version to avoid
- ABI issues
-- make gst-plugins obsolete gst-plugin-libs
-- also send output of gst-register-%%{majorminor} to /dev/null to lower the noise
-
-* Wed Jul 03 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- require glibc-devel instead of glibc-kernheaders since the latter is only
- since 7.3 and glibc-devel pulls in the right package anyway
-
-* Sun Jun 23 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- changed header location of plug-in libs
-
-* Mon Jun 17 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- major cleanups
-- adding gst-register-%%{majorminor} on postun everywhere
-- remove ldconfig since we don't actually install libs in system dirs
-- removed misc package
-- added video-effects
-- dot every Summary
-- uniformify all descriptions a little
-
-* Thu Jun 06 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- various BuildRequires: additions
-
-* Tue Jun 04 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- added USE_LIBADSPA_TRUE bits to ladspa package
-
-* Mon Jun 03 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- Added libfame package
-
-* Mon May 12 2002 Christian Fredrik Kalager Schaller <Uraeus(a)linuxrising.org>
-- Added jack, dxr3, http packages
-- Added visualisation plug-ins, effecttv and synaesthesia
-- Created devel package
-- Removed gstreamer-plugins-libs package (moved it into gstreamer-plugins)
-- Replaced prefix/dirname with _macros
-
-* Mon May 06 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- added gstreamer-GConf package
-
-* Wed Mar 13 2002 Thomas Vander Stichele <thomas(a)apestaart.org>
-- added more BuildRequires and Requires
-- rearranged some plug-ins
-- added changelog ;)
-
7 years, 11 months
[buildsys-build-rpmfusion] Bumpd for f24
by Nicolas Chauvet
commit b2896d20ec66380541b901ea04dc22cbde915170
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 16 14:37:12 2016 +0200
Bumpd for f24
buildsys-build-rpmfusion.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 245757a..f5ec294 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -2,8 +2,8 @@
Name: buildsys-build-%{repo}
Epoch: 10
-Version: 23
-Release: 1
+Version: 24
+Release: 0.2
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 16 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 10:24-0.2
+- Bump for 24
+
* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 10:23-1
- rebuild for kernel 4.2.3-300.fc23
7 years, 11 months
[rpmfusion-free-release/f23] Update to final f23
by Nicolas Chauvet
commit 3aeea080e9fb0d61f9af70700b5f31b81918402b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 16 13:11:04 2016 +0200
Update to final f23
rpmfusion-free-release.spec | 5 ++++-
rpmfusion-free-updates-testing.repo | 2 +-
rpmfusion-free-updates.repo | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 0992e80..e6f3866 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -3,7 +3,7 @@
Name: rpmfusion-%{repo}-release
Version: 23
-Release: 0.1
+Release: 1
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -86,6 +86,9 @@ ln -s $(basename %{SOURCE25}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Mon May 16 2016 Nicolas Chauvet <kwizart(a)gmail.com > - 23-1
+- Update to final f23
+
* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 23-0.1
- Bump for branched/f23
diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo
index 42078e9..16eb0de 100644
--- a/rpmfusion-free-updates-testing.repo
+++ b/rpmfusion-free-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Free - Test Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
-enabled=1
+enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
diff --git a/rpmfusion-free-updates.repo b/rpmfusion-free-updates.repo
index 6526837..c92bd09 100644
--- a/rpmfusion-free-updates.repo
+++ b/rpmfusion-free-updates.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Free - Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
-enabled=0
+enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
7 years, 11 months
[rpmfusion-free-release/f24] Update changelog
by Nicolas Chauvet
commit 6004f2f504da10056943b476ecbc574c187ba87d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 16 10:35:20 2016 +0200
Update changelog
rpmfusion-free-release.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 2422611..722ccdc 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -88,6 +88,7 @@ ln -s $(basename %{SOURCE25}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-
%changelog
* Sat May 14 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 24-0.1
- Update to 24
+- Disable gpg signature on updates-testing for now
* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 23-0.1
- Bump for branched/f23
7 years, 11 months
[rpmfusion-free-release/f24] Disable signature for f24-branch
by Nicolas Chauvet
commit 2c2b2ec00914119ee7246be53a4a50c368573197
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 16 10:31:45 2016 +0200
Disable signature for f24-branch
rpmfusion-free-updates-testing.repo | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo
index 42078e9..378a2c6 100644
--- a/rpmfusion-free-updates-testing.repo
+++ b/rpmfusion-free-updates-testing.repo
@@ -3,7 +3,7 @@ name=RPM Fusion for Fedora $releasever - Free - Test Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
enabled=1
-gpgcheck=1
+gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
[rpmfusion-free-updates-testing-debuginfo]
@@ -11,7 +11,7 @@ name=RPM Fusion for Fedora $releasever - Free - Test Updates Debug
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/debug/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
enabled=0
-gpgcheck=1
+gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
[rpmfusion-free-updates-testing-source]
@@ -19,6 +19,6 @@ name=RPM Fusion for Fedora $releasever - Free - Test Updates Source
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/SRPMS/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
enabled=0
-gpgcheck=1
+gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
7 years, 11 months
[x264/f23] Revert "Update sources"
by Nicolas Chauvet
commit ffe4b8a82e80d1d10e80dde940be5defd68b2376
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 16 13:02:23 2016 +0200
Revert "Update sources"
This reverts commit ab1a9f484c9249c2dd14bdc2bb021dfc9b3fdf10.
sources | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/sources b/sources
index 75e0924..9329a37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0cd396fbcce6c5102fe06d7b29fd97dd x264-0.148-20160412-fd2c324.tar.bz2
+03f0f92f1689d8f5a4032fb9342ebdba x264-0.148-20160118-5c65704.tar.bz2
7 years, 11 months
[x264/f23] Update sources
by Nicolas Chauvet
commit ab1a9f484c9249c2dd14bdc2bb021dfc9b3fdf10
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 16 13:01:08 2016 +0200
Update sources
sources | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/sources b/sources
index 9329a37..75e0924 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03f0f92f1689d8f5a4032fb9342ebdba x264-0.148-20160118-5c65704.tar.bz2
+0cd396fbcce6c5102fe06d7b29fd97dd x264-0.148-20160412-fd2c324.tar.bz2
7 years, 11 months
[libquicktime] Bump release.
by Nicolas Chauvet
commit b8458e289c7782b1c54b00e59b15e1c2a850efff
Author: Michael Kuhn <suraia(a)ikkoku.de>
Date: Sat May 14 21:15:23 2016 +0200
Bump release.
libquicktime.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
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(a)ikkoku.de> - 1.2.4-21
+- Add patches for libav 10 and ffmpeg 3.0.
+
* Mon Oct 26 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.4-20
- Bump for x264
7 years, 11 months
[libquicktime] Add patch for ffmpeg 3.0.
by Nicolas Chauvet
commit 92210f04a66f15656c286620a9ed2045f3c0f8d3
Author: Michael Kuhn <suraia(a)ikkoku.de>
Date: Sat May 14 11:25:52 2016 +0200
Add patch for ffmpeg 3.0.
ffmpeg_2.9.patch | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
libquicktime.spec | 2 +
2 files changed, 353 insertions(+)
---
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(a)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/%{name}-%{version}.tar.gz
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
# --------------------------------------------------------------------
7 years, 11 months
[libquicktime] Add patch for libav 10.
by Nicolas Chauvet
commit c7488465f2280eaedc2d037944df9fd340048911
Author: Michael Kuhn <suraia(a)ikkoku.de>
Date: Sat May 14 11:06:25 2016 +0200
Add patch for libav 10.
libav10.patch | 654 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
libquicktime.spec | 2 +
2 files changed, 656 insertions(+)
---
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(a)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/%{name}-%{version}.tar.gz
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
# --------------------------------------------------------------------
7 years, 11 months