Help on updating multimedia/mpeg4ip

[Mario Sergio Fujikawa Ferreira]

Hi,

	A lot of people is having trouble updating their mpeg4ip
after the recent upgrade to version 1.1

	I added a few lines to /usr/ports/UPDATING about it. Let
me know if you still have problems updating even after applying
these instructions.

  mpeg4ip has been updated and broken down into 2 separate ports:
  mpeg4ip and mpeg4ip-libmp4v2. Furthermore, mpeg4ip now depends
  on faad. Moreover, faad now depends on mpeg4ip-libmp4v2 rather
  than on mpeg4ip which avoids a cyclic dependency (mpeg4ip depends
  on faad which depends on mpeg4ip).

  If any of the old ports are installed, mpeg4ip will not compile.
  Therefore,

  1) Remove old faad and mpeg4ip ports which conflict with new
  mpeg4ip

  pkg_delete -f /var/db/pkg/mpeg4ip*
  pkg_delete -f /var/db/pkg/faad*

  2) Install faad, mpeg4ip and mpeg4ip-libmp4v2 in the following
  order

  cd /usr/ports/multimedia/mpeg4ip-libmp4v2 && make install clean
  cd /usr/ports/audio/faad && make install clean
  cd /usr/ports/multimedia/mpeg4ip && make install clean

	I hope this help out people upgrading. Furthermore, I got
around a 4.x-STABLE machine so I might have a solution for those
with problems trying to build the new port under it.

	Please, anyone running a FreeBSD 4.x system, try the attached
patch and let me know if it solves your problems. I'll commit it
as soon as I receive positive feedback on it.

	Regards,

-- 
Mario S F Ferreira - DF - Brazil - "I guess this is a signature."
feature, n: a documented bug | bug, n: an undocumented feature
-------------- next part --------------
diff -ruN /usr/ports/multimedia/mpeg4ip/Makefile mpeg4ip/Makefile
--- /usr/ports/multimedia/mpeg4ip/Makefile	Wed Nov 10 10:02:43 2004
+++ mpeg4ip/Makefile	Thu Nov 11 20:35:45 2004
@@ -92,6 +92,7 @@
 # Build fix
 .if ${OSVERSION} >= 502100
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-lib::sdp::sdp_decode.c
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-player::src::codec::mp3::mp3_file.cpp
 .else
 USE_GCC=	3.4
 .endif
diff -ruN /usr/ports/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp
--- /usr/ports/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp	Wed Dec 31 21:00:00 1969
+++ mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp	Tue Nov  9 23:02:23 2004
@@ -0,0 +1,10 @@
+--- player/src/codec/mp3/mp3_file.cpp.orig      Wed Sep 29 00:24:31 2004
++++ player/src/codec/mp3/mp3_file.cpp   Wed Sep 29 00:28:47 2004
+@@ -126,6 +126,7 @@
+     descptr[1] = strdup(desc);
+     CHECK_AND_FREE(ret);
+   }
++  ret = ID3_v1_genre_description[NULL];
+   ret = ID3_GetAlbum(&myTag);
+   if (ret) {
+
diff -ruN /usr/ports/multimedia/mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp
--- /usr/ports/multimedia/mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp	Tue Nov  9 23:02:23 2004
+++ mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp	Wed Dec 31 21:00:00 1969
@@ -1,10 +0,0 @@
---- player/src/codec/mp3/mp3_file.cpp.orig      Wed Sep 29 00:24:31 2004
-+++ player/src/codec/mp3/mp3_file.cpp   Wed Sep 29 00:28:47 2004
-@@ -126,6 +126,7 @@
-     descptr[1] = strdup(desc);
-     CHECK_AND_FREE(ret);
-   }
-+  ret = ID3_v1_genre_description[NULL];
-   ret = ID3_GetAlbum(&myTag);
-   if (ret) {
-