From ad491f2a8db4978349cd739bc8466ff64df8b000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Sat, 3 Feb 2018 06:53:28 +0000
Subject: [PATCH] Update to 1.2.4-98-g859a717 from branch master

---
 .gitignore             |  1 +
 ChangeLog              | 35 +++++++++++++++++++++++++++++++++++
 libquicktime.spec      | 14 +++++++++-----
 sources                |  2 +-
 update_libquicktime.sh |  7 ++++---
 5 files changed, 50 insertions(+), 9 deletions(-)

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;