Hi,
so i wanted to update easytag and now it needs a newer libmp4v2.. which
changed homepage/maintainers/moved headers around/etc.. so here's a diff
updating it, and 3 diffs to "fix" the consumers (gtkpod, faac, daapd).
mediatomb builds fine with that updated libmp4v2 so no diff for it.
I'd like real users of daapd/gtkpod/faac to report whether it breaks
nothing for them.. so far only build-tested @amd64.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libmp4v2/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 19 Nov 2010 07:23:13 -0000 1.3
+++ Makefile 2 May 2012 15:08:35 -0000
@@ -2,13 +2,14 @@
COMMENT = read and manipulate the MP4 container format
-DISTNAME = libmp4v2-1.5.0.1
+DISTNAME = mp4v2-1.9.1
+PKGNAME = lib${DISTNAME}
-SHARED_LIBS = mp4v2 3.0
+SHARED_LIBS = mp4v2 4.0 #1.9
CATEGORIES = multimedia audio
-HOMEPAGE = http://resare.com/libmp4v2/
+HOMEPAGE = https://code.google.com/p/mp4v2/
MAINTAINER = Jacob Meuser <jake...@openbsd.org>
@@ -20,11 +21,14 @@
WANTLIB = c m stdc++
-MASTER_SITES = ${HOMEPAGE}/dist/
+MASTER_SITES = https://mp4v2.googlecode.com/files/
EXTRACT_SUFX = .tar.bz2
+BUILD_DEPENDS = devel/help2man
USE_LIBTOOL = Yes
USE_GROFF = Yes
+USE_GMAKE = Yes
+MAKE_FILE = GNUmakefile
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += ${CONFIGURE_SHARED}
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/libmp4v2/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 15 Sep 2008 21:46:28 -0000 1.1.1.1
+++ distinfo 2 May 2012 15:08:35 -0000
@@ -1,5 +1,5 @@
-MD5 (libmp4v2-1.5.0.1.tar.bz2) = kOsrCUDr4C74G3pgUwvq7g==
-RMD160 (libmp4v2-1.5.0.1.tar.bz2) = hRmfgQep63XUV0QVgsTFi/ATtaI=
-SHA1 (libmp4v2-1.5.0.1.tar.bz2) = naWS9tvEAwCbwoRfEFAkCJ7APPA=
-SHA256 (libmp4v2-1.5.0.1.tar.bz2) =
l9ZHNYds8iCoew2vDY79hOQtWsMvSAh+iTYo6/W9yAA=
-SIZE (libmp4v2-1.5.0.1.tar.bz2) = 375541
+MD5 (mp4v2-1.9.1.tar.bz2) = mGcBkp7xWwMVWsT7FkRHlw==
+RMD160 (mp4v2-1.9.1.tar.bz2) = Zq7ReSVYm0nsOxJBv8tFqOMYHAg=
+SHA1 (mp4v2-1.9.1.tar.bz2) = xi0A6Ztl784WrM2DxQH7ilcgaqg=
+SHA256 (mp4v2-1.9.1.tar.bz2) = XDgcrqsjJvxIz9oP4gK9uLoK5iTZyXrXaAorB+LC47Q=
+SIZE (mp4v2-1.9.1.tar.bz2) = 432943
Index: patches/patch-test_Makefile_in
===================================================================
RCS file: patches/patch-test_Makefile_in
diff -N patches/patch-test_Makefile_in
--- patches/patch-test_Makefile_in 15 Sep 2008 21:46:28 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-test_Makefile_in,v 1.1.1.1 2008/09/15 21:46:28 jakemsr Exp $
---- test/Makefile.in.orig Sat Jun 28 21:40:39 2008
-+++ test/Makefile.in Sat Jun 28 21:44:11 2008
-@@ -191,7 +191,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/util
- c_api_SOURCES = c_api.c
--c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++
-+c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++ -lm
- mp4broadcaster_SOURCES = mp4broadcaster.cpp
- mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la
- nullcreate_SOURCES = nullcreate.cpp
Index: patches/patch-test_mp4broadcaster_cpp
===================================================================
RCS file: patches/patch-test_mp4broadcaster_cpp
diff -N patches/patch-test_mp4broadcaster_cpp
--- patches/patch-test_mp4broadcaster_cpp 15 Sep 2008 21:46:28 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-test_mp4broadcaster_cpp,v 1.1.1.1 2008/09/15 21:46:28 jakemsr
Exp $
---- test/mp4broadcaster.cpp.orig Sat Jun 28 21:44:31 2008
-+++ test/mp4broadcaster.cpp Sat Jun 28 21:47:38 2008
-@@ -21,6 +21,8 @@
-
- #include "mpeg4ip.h"
- #include <arpa/inet.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include "mp4.h"
-
- // forward declarations
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/libmp4v2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 15 Sep 2008 21:46:28 -0000 1.1.1.1
+++ pkg/PLIST 2 May 2012 15:08:35 -0000
@@ -2,121 +2,33 @@
@conflict faad-<2.6.1
%%SHARED%%
@bin bin/mp4art
-@bin bin/mp4dump
+@bin bin/mp4chaps
@bin bin/mp4extract
+@bin bin/mp4file
@bin bin/mp4info
+@bin bin/mp4subtitle
@bin bin/mp4tags
+@bin bin/mp4track
@bin bin/mp4trackdump
-include/mp4.h
+include/mp4v2/
+include/mp4v2/chapter.h
+include/mp4v2/file.h
+include/mp4v2/file_prop.h
+include/mp4v2/general.h
+include/mp4v2/isma.h
+include/mp4v2/itmf_generic.h
+include/mp4v2/itmf_tags.h
+include/mp4v2/meta.h
+include/mp4v2/mp4v2.h
+include/mp4v2/platform.h
+include/mp4v2/project.h
+include/mp4v2/sample.h
+include/mp4v2/streaming.h
+include/mp4v2/track.h
+include/mp4v2/track_prop.h
lib/libmp4v2.a
lib/libmp4v2.la
-@man man/man3/MP4.3
-@man man/man3/MP4AddAudioTrack.3
-@man man/man3/MP4AddHintTrack.3
-@man man/man3/MP4AddODTrack.3
-@man man/man3/MP4AddRtpESConfigurationPacket.3
-@man man/man3/MP4AddRtpHint.3
-@man man/man3/MP4AddRtpImmediateData.3
-@man man/man3/MP4AddRtpPacket.3
-@man man/man3/MP4AddRtpSampleData.3
-@man man/man3/MP4AddRtpVideoHint.3
-@man man/man3/MP4AddSceneTrack.3
-@man man/man3/MP4AddSystemsTrack.3
-@man man/man3/MP4AddTrack.3
-@man man/man3/MP4AddTrackEdit.3
-@man man/man3/MP4AddVideoTrack.3
-@man man/man3/MP4AppendHintTrackSdp.3
-@man man/man3/MP4AppendSessionSdp.3
-@man man/man3/MP4BinaryToBase16.3
-@man man/man3/MP4BinaryToBase64.3
-@man man/man3/MP4CloneTrack.3
-@man man/man3/MP4Close.3
-@man man/man3/MP4ConvertFromMovieDuration.3
-@man man/man3/MP4ConvertFromTrackDuration.3
-@man man/man3/MP4ConvertFromTrackTimestamp.3
-@man man/man3/MP4ConvertToTrackDuration.3
-@man man/man3/MP4ConvertToTrackTimestamp.3
-@man man/man3/MP4CopySample.3
-@man man/man3/MP4CopyTrack.3
-@man man/man3/MP4Create.3
-@man man/man3/MP4DeleteTrack.3
-@man man/man3/MP4DeleteTrackEdit.3
-@man man/man3/MP4Dump.3
-@man man/man3/MP4FileInfo.3
-@man man/man3/MP4FindTrackId.3
-@man man/man3/MP4FindTrackIndex.3
-@man man/man3/MP4GetAudioProfileLevel.3
-@man man/man3/MP4GetDuration.3
-@man man/man3/MP4GetGraphicsProfileLevel.3
-@man man/man3/MP4GetHintTrackReferenceTrackId.3
-@man man/man3/MP4GetHintTrackRtpPayload.3
-@man man/man3/MP4GetHintTrackSdp.3
-@man man/man3/MP4GetNumberOfTracks.3
-@man man/man3/MP4GetODProfileLevel.3
-@man man/man3/MP4GetRtpHintNumberOfPackets.3
-@man man/man3/MP4GetRtpPacketBFrame.3
-@man man/man3/MP4GetRtpPacketTransmitOffset.3
-@man man/man3/MP4GetRtpTimestampStart.3
-@man man/man3/MP4GetSampleDuration.3
-@man man/man3/MP4GetSampleIdFromEditTime.3
-@man man/man3/MP4GetSampleIdFromTime.3
-@man man/man3/MP4GetSampleRenderingOffset.3
-@man man/man3/MP4GetSampleSize.3
-@man man/man3/MP4GetSampleSync.3
-@man man/man3/MP4GetSampleTime.3
-@man man/man3/MP4GetSceneProfileLevel.3
-@man man/man3/MP4GetSessionSdp.3
-@man man/man3/MP4GetTimeScale.3
-@man man/man3/MP4GetTrackAudioMpeg4Type.3
-@man man/man3/MP4GetTrackAudioType.3
-@man man/man3/MP4GetTrackBitRate.3
-@man man/man3/MP4GetTrackDuration.3
-@man man/man3/MP4GetTrackESConfiguration.3
-@man man/man3/MP4GetTrackEditDuration.3
-@man man/man3/MP4GetTrackEditDwell.3
-@man man/man3/MP4GetTrackEditMediaStart.3
-@man man/man3/MP4GetTrackEditStart.3
-@man man/man3/MP4GetTrackEditTotalDuration.3
-@man man/man3/MP4GetTrackFixedSampleDuration.3
-@man man/man3/MP4GetTrackMaxSampleSize.3
-@man man/man3/MP4GetTrackNumberOfEdits.3
-@man man/man3/MP4GetTrackNumberOfSamples.3
-@man man/man3/MP4GetTrackTimeScale.3
-@man man/man3/MP4GetTrackType.3
-@man man/man3/MP4GetTrackVideoFrameRate.3
-@man man/man3/MP4GetTrackVideoHeight.3
-@man man/man3/MP4GetTrackVideoType.3
-@man man/man3/MP4GetTrackVideoWidth.3
-@man man/man3/MP4GetVerbosity.3
-@man man/man3/MP4GetVideoProfileLevel.3
-@man man/man3/MP4Info.3
-@man man/man3/MP4MakeIsmaCompliant.3
-@man man/man3/MP4Modify.3
-@man man/man3/MP4Optimize.3
-@man man/man3/MP4Read.3
-@man man/man3/MP4ReadRtpHint.3
-@man man/man3/MP4ReadRtpPacket.3
-@man man/man3/MP4ReadSample.3
-@man man/man3/MP4ReadSampleFromEditTime.3
-@man man/man3/MP4ReadSampleFromTime.3
-@man man/man3/MP4SetAudioProfileLevel.3
-@man man/man3/MP4SetGraphicsProfileLevel.3
-@man man/man3/MP4SetHintTrackRtpPayload.3
-@man man/man3/MP4SetHintTrackSdp.3
-@man man/man3/MP4SetODProfileLevel.3
-@man man/man3/MP4SetRtpTimestampStart.3
-@man man/man3/MP4SetSampleRenderingOffset.3
-@man man/man3/MP4SetSceneProfileLevel.3
-@man man/man3/MP4SetSessionSdp.3
-@man man/man3/MP4SetTimeScale.3
-@man man/man3/MP4SetTrackESConfiguration.3
-@man man/man3/MP4SetTrackEditDuration.3
-@man man/man3/MP4SetTrackEditDwell.3
-@man man/man3/MP4SetTrackEditMediaStart.3
-@man man/man3/MP4SetTrackTimeScale.3
-@man man/man3/MP4SetVerbosity.3
-@man man/man3/MP4SetVideoProfileLevel.3
-@man man/man3/MP4WriteRtpHint.3
-@man man/man3/MP4WriteSample.3
-man/manm/
-man/manm/api.mpt
+@man man/man1/mp4art.1
+@man man/man1/mp4file.1
+@man man/man1/mp4subtitle.1
+@man man/man1/mp4track.1
Index: patches/patch-db_cc
===================================================================
RCS file: /cvs/ports/audio/daapd/patches/patch-db_cc,v
retrieving revision 1.1
diff -u -r1.1 patch-db_cc
--- patches/patch-db_cc 15 Sep 2008 21:49:10 -0000 1.1
+++ patches/patch-db_cc 2 May 2012 14:42:54 -0000
@@ -1,6 +1,15 @@
$OpenBSD: patch-db_cc,v 1.1 2008/09/15 21:49:10 jakemsr Exp $
---- db.cc.orig Tue Jul 22 02:40:07 2008
-+++ db.cc Tue Jul 22 02:40:07 2008
+--- db.cc.orig Sun Mar 5 14:39:37 2006
++++ db.cc Wed May 2 16:25:48 2012
+@@ -42,7 +42,7 @@
+ #include <id3tag.h>
+
+ #ifdef MPEG4_ENABLE
+- #include <mp4.h>
++ #include <mp4v2/mp4v2.h>
+ #endif
+
+
@@ -325,7 +325,7 @@ void Database::addM4a( std::string& path, struct stat
MP4TrackId trackId = MP4FindTrackId(mp4file, 0);
u32 timeScale = MP4GetTrackTimeScale(mp4file, trackId);
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/audio/faac/patches/patch-configure_in,v
retrieving revision 1.5
diff -u -r1.5 patch-configure_in
--- patches/patch-configure_in 18 Oct 2011 08:40:55 -0000 1.5
+++ patches/patch-configure_in 2 May 2012 14:54:57 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.5 2011/10/18 08:40:55 ajacoutot Exp $
---- configure.in.orig Wed Feb 4 19:55:38 2009
-+++ configure.in Wed Jun 29 17:49:41 2011
+--- configure.in.orig Thu Feb 5 01:55:38 2009
++++ configure.in Wed May 2 16:43:37 2012
@@ -1,7 +1,7 @@
AC_PREREQ(2.50)
AC_INIT(FAAC, 1.28, faac-...@lists.sourceforge.net)
@@ -19,8 +19,9 @@
AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
- external_mp4v2=no, -lstdc++),
+- external_mp4v2=no, [#include <mp4.h>])
+ external_mp4v2=no, -lstdc++ -lm),
- external_mp4v2=no, [#include <mp4.h>])
++ external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
if test x$external_mp4v2 = xyes; then
AC_MSG_NOTICE([*** Building with external mp4v2 ***])
Index: patches/patch-frontend_main_c
===================================================================
RCS file: patches/patch-frontend_main_c
diff -N patches/patch-frontend_main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-frontend_main_c 2 May 2012 14:54:57 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- frontend/main.c.orig Wed May 2 16:44:58 2012
++++ frontend/main.c Wed May 2 16:45:07 2012
+@@ -30,7 +30,7 @@
+ #endif
+
+ #ifdef HAVE_LIBMP4V2
+-# include <mp4.h>
++# include <mp4v2/mp4v2.h>
+ #endif
+
+ #define DEFAULT_TNS 0
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/gtkpod/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile 15 Nov 2011 15:43:51 -0000 1.42
+++ Makefile 2 May 2012 14:42:21 -0000
@@ -2,6 +2,7 @@
COMMENT= GTK+2 program to synchronize an Apple iPod
DISTNAME= gtkpod-1.0.0
+REVISION = 0
CATEGORIES= audio x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
@@ -20,18 +21,20 @@
WANTLIB += pthread-stubs xcb z xml2 png glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 atk-1.0 pixman-1
WANTLIB += gio-2.0 id3tag gpod gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 curl
-WANTLIB += glade-2.0 mp4v2 xcb-render GL xcb-shm FLAC ogg vorbis vorbisfile
+WANTLIB += glade-2.0 xcb-render GL xcb-shm FLAC ogg vorbis vorbisfile
USE_GMAKE= Yes
-RUN_DEPENDS= devel/desktop-file-utils
+#libmp4v2 is dlopen()'ed at runtime
+RUN_DEPENDS= devel/desktop-file-utils \
+ multimedia/libmp4v2
+
LIB_DEPENDS= audio/libid3tag \
audio/libgpod \
audio/flac \
audio/libvorbis \
devel/libglade2 \
- net/curl \
- multimedia/libmp4v2
+ net/curl
MODULES= devel/gettext textproc/intltool
