diff -u gtkpod-aac-0.99.10/debian/patches/00list gtkpod-aac-0.99.10/debian/patches/00list --- gtkpod-aac-0.99.10/debian/patches/00list +++ gtkpod-aac-0.99.10/debian/patches/00list @@ -1,0 +2 @@ +disable-mp4-grouping diff -u gtkpod-aac-0.99.10/debian/changelog gtkpod-aac-0.99.10/debian/changelog --- gtkpod-aac-0.99.10/debian/changelog +++ gtkpod-aac-0.99.10/debian/changelog @@ -1,3 +1,10 @@ +gtkpod-aac (0.99.10-2ubuntu2) hardy; urgency=low + + * disable-mp4-grouping.dpatch: Disable MP4 grouping retrieval + as our libmp4v2 doesn't support it (LP: #135178) + + -- John Dong Sun, 04 Nov 2007 21:27:46 -0500 + gtkpod-aac (0.99.10-2ubuntu1) gutsy; urgency=low * Resynchronise with gtkpod 0.9.10-2. only in patch2: unchanged: --- gtkpod-aac-0.99.10.orig/debian/patches/disable-mp4-grouping.dpatch +++ gtkpod-aac-0.99.10/debian/patches/disable-mp4-grouping.dpatch @@ -0,0 +1,112 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-disable-mp4-grouping.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gtkpod-aac-0.99.10~/configure gtkpod-aac-0.99.10/configure +--- gtkpod-aac-0.99.10~/configure 2007-11-04 21:46:35.000000000 -0500 ++++ gtkpod-aac-0.99.10/configure 2007-11-04 21:46:35.000000000 -0500 +@@ -8380,9 +8380,9 @@ + + + +-{ echo "$as_me:$LINENO: checking for library containing MP4GetMetadataGrouping" >&5 +-echo $ECHO_N "checking for library containing MP4GetMetadataGrouping... $ECHO_C" >&6; } +-if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then ++{ echo "$as_me:$LINENO: checking for library containing MP4FileInfo" >&5 ++echo $ECHO_N "checking for library containing MP4FileInfo... $ECHO_C" >&6; } ++if test "${ac_cv_search_MP4FileInfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS +@@ -8399,11 +8399,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char MP4GetMetadataGrouping (); ++char MP4FileInfo (); + int + main () + { +-return MP4GetMetadataGrouping (); ++return MP4FileInfo (); + ; + return 0; + } +@@ -8433,7 +8433,7 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- ac_cv_search_MP4GetMetadataGrouping=$ac_res ++ ac_cv_search_MP4FileInfo=$ac_res + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -8443,21 +8443,21 @@ + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext +- if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then ++ if test "${ac_cv_search_MP4FileInfo+set}" = set; then + break + fi + done +-if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then ++if test "${ac_cv_search_MP4FileInfo+set}" = set; then + : + else +- ac_cv_search_MP4GetMetadataGrouping=no ++ ac_cv_search_MP4FileInfo=no + fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_search_MP4GetMetadataGrouping" >&5 +-echo "${ECHO_T}$ac_cv_search_MP4GetMetadataGrouping" >&6; } +-ac_res=$ac_cv_search_MP4GetMetadataGrouping ++{ echo "$as_me:$LINENO: result: $ac_cv_search_MP4FileInfo" >&5 ++echo "${ECHO_T}$ac_cv_search_MP4FileInfo" >&6; } ++ac_res=$ac_cv_search_MP4FileInfo + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + if test "${ac_cv_header_mp4_h+set}" = set; then +diff -urNad gtkpod-aac-0.99.10~/configure.in gtkpod-aac-0.99.10/configure.in +--- gtkpod-aac-0.99.10~/configure.in 2007-11-04 21:38:38.000000000 -0500 ++++ gtkpod-aac-0.99.10/configure.in 2007-11-04 21:46:35.000000000 -0500 +@@ -137,7 +137,7 @@ + + + dnl Check for libmp4v2 (and mp4.h) +-AC_SEARCH_LIBS(MP4GetMetadataGrouping, ++AC_SEARCH_LIBS(MP4FileInfo, + ["mp4v2" "mp4v2 -lstdc++" "mp4v2 -lz" "mp4v2 -lz -lstdc++"], + [AC_CHECK_HEADER(mp4.h, + [have_mp4v2="yes -- will build with aac support" AC_DEFINE_UNQUOTED(HAVE_LIBMP4V2, 1, ["Define to 1 if you have the mp4v2 library"])], +diff -urNad gtkpod-aac-0.99.10~/src/mp4file.c gtkpod-aac-0.99.10/src/mp4file.c +--- gtkpod-aac-0.99.10~/src/mp4file.c 2007-11-04 21:38:38.000000000 -0500 ++++ gtkpod-aac-0.99.10/src/mp4file.c 2007-11-04 21:47:20.000000000 -0500 +@@ -344,11 +344,6 @@ + track->cd_nr = numvalue; + track->cds = numvalue2; + } +- if (MP4GetMetadataGrouping(mp4File, &value) && value != NULL) +- { +- track->grouping = charset_to_utf8 (value); +- g_free (value); +- } + if (MP4GetMetadataGenre(mp4File, &value) && value != NULL) + { + track->genre = charset_to_utf8 (value); +@@ -485,10 +480,6 @@ + + MP4SetMetadataTempo (mp4File, track->BPM); + +- value = charset_from_utf8 (track->grouping); +- MP4SetMetadataGrouping (mp4File, value); +- g_free (value); +- + value = charset_from_utf8 (track->genre); + MP4SetMetadataGenre (mp4File, value); + g_free (value);