Re: [update] libmp4v2 1.9.1

2012-05-04 Thread Landry Breuil
On Wed, May 02, 2012 at 05:14:10PM +0200, Landry Breuil wrote:
 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.

Fwiw it went in a bulk build and caused no fallout.

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 -  1.3
 +++ Makefile  2 May 2012 15:08:35 -
 @@ -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 -  1.1.1.1
 +++ distinfo  2 May 2012 15:08:35 -
 @@ -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_in15 Sep 2008 21:46:28 -  1.1.1.1
 +++ /dev/null 1 Jan 1970 00:00:00 -
 @@ -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.origSat 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 -  
 1.1.1.1
 +++ /dev/null 1 Jan 1970 00:00:00 -
 @@ -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 -  1.1.1.1
 +++ pkg/PLIST 2 May 2012 15:08:35 -
 @@ -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
 

Re: [update] libmp4v2 1.9.1

2012-05-04 Thread Brad Smith

On 02/05/12 11:14 AM, Landry Breuil wrote:

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


I don't use any of the dependent ports but the diffs look good to me.


--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



[update] libmp4v2 1.9.1

2012-05-02 Thread Landry Breuil
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
--- Makefile19 Nov 2010 07:23:13 -  1.3
+++ Makefile2 May 2012 15:08:35 -
@@ -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
--- distinfo15 Sep 2008 21:46:28 -  1.1.1.1
+++ distinfo2 May 2012 15:08:35 -
@@ -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 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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 -  
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.cppSat 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 -  1.1.1.1
+++ pkg/PLIST   2 May 2012 15:08:35 -
@@ -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