From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 17 Aug 2011 22:29:56 +0000 (+0000)
Subject: - use mp4v2 implementation instead of mpeg4ip, fix itmf_tags.h detection
X-Git-Tag: auto/th/gtkpod-2_1_0-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgtkpod.git;a=commitdiff_plain;h=830f620

- use mp4v2 implementation instead of mpeg4ip, fix itmf_tags.h detection

Changed files:
    gtkpod.spec -> 1.38
    itmf_tags.patch -> 1.1
---

diff --git a/gtkpod.spec b/gtkpod.spec
index c74b5ba..d10e525 100644
--- a/gtkpod.spec
+++ b/gtkpod.spec
@@ -1,15 +1,16 @@
 # TODO
-# - Check for MP4 Headers: mp4v2/mp4v2.h: mp4v2-devel
+# - build system breaks autoconf cache: i.e PKGCONFIG and FAAD should not be set to custom values
 Summary:	Graphical song management program for Apple's iPod
 Summary(pl.UTF-8):	Graficzny menadżer utworów muzycznych dla urządzeń Apple iPod
 Name:		gtkpod
 Version:	2.1.0
-Release:	3
+Release:	4
 License:	GPL/LGPL
 Group:		X11/Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz
 # Source0-md5:	8e01f7cf2db1a421140eab561aee26d7
-Patch1:		desktop.patch
+Patch0:		desktop.patch
+Patch1:		itmf_tags.patch
 URL:		http://www.gtkpod.org/
 BuildRequires:	flex
 BuildRequires:	gdl-devel >= 3.0.0
@@ -23,6 +24,7 @@ BuildRequires:	libgnomecanvas-devel
 BuildRequires:	libgpod-devel >= 0.4.0
 BuildRequires:	libid3tag-devel >= 0.15
 BuildRequires:	libxml2-devel >= 2.7.7
+BuildRequires:	mp4v2-devel
 BuildRequires:	perl-XML-Parser
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
@@ -36,6 +38,9 @@ Requires:	mount
 Suggests:	faad2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# clears PKGCONFIG, making cache reuse impossible
+%undefine	configure_cache
+
 %description
 Platform independent graphical song management program for Apple's
 iPod. It allows you to upload songs and playlists to your iPod.
@@ -46,10 +51,16 @@ urządzeń Apple iPod. Pozwala wgrywać pliki i listy utworów do iPoda.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %{__sed} -i -e 's!/usr/bin/awk!/bin/awk!g' scripts/ldif2vcf.sh
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	FAAD=yes \
 	--disable-static
diff --git a/itmf_tags.patch b/itmf_tags.patch
new file mode 100644
index 0000000..66e88de
--- /dev/null
+++ b/itmf_tags.patch
@@ -0,0 +1,27 @@
+--- gtkpod-2.1.0/./CMakeLists.txt~	2011-07-17 20:46:59.000000000 +0300
++++ gtkpod-2.1.0/./CMakeLists.txt	2011-08-18 01:19:43.993660139 +0300
+@@ -51,7 +51,7 @@
+ # typedef void* MP4FileHandle;//>
+ # #include <mp4v2/itmf_tags.h>
+ # This matches the way it's used in the code, and the autoconf test
+-CHECK_INCLUDE_FILES("mp4v2/platform.h>\ntypedef void* MP4FileHandle\;//;mp4v2/itmf_tags.h" HAVE_MP4V2_ITMF_TAGS_H)
++CHECK_INCLUDE_FILES("mp4v2/platform.h>\ninclude <stdint.h>\ntypedef void* MP4FileHandle\;//;mp4v2/itmf_tags.h" HAVE_MP4V2_ITMF_TAGS_H)
+ 
+ set(OPT_INCLUDES "")
+ set(OPT_CFLAGS "")
+--- gtkpod-2.1.0/configure.ac	2011-08-18 01:19:58.317693619 +0300
++++ gtkpod-2.1.0/configure.ac	2011-08-18 01:24:48.655205091 +0300
+@@ -280,9 +280,12 @@
+ 	dnl rollback to older mp4 library - should help with distros
+ 	dnl not using 1.9.1 of the mp4v2 library
+ 	AC_CHECK_HEADERS([mp4.h], have_mp4=yes, have_mp4=no)
++else
++	AC_CHECK_HEADERS([mp4v2/platform.h], [], [])
+ fi
+ AC_CHECK_HEADERS([mp4v2/itmf_tags.h], [], [],
+-		 [#ifdef HAVE_MP4V2_PLATFORM_H
++		 [#include <stdint.h>
++		  #ifdef HAVE_MP4V2_PLATFORM_H
+ 		  # include <mp4v2/platform.h>
+ 		  #endif
+ 		  typedef void* MP4FileHandle;