FreeBSD Bugzilla – Attachment 107822 Details for
Bug 148643
New port: multimedia/mp4v2, replaces multimedia/mpeg4ip-libmp4v2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
audio-gtkpod.patch
audio-gtkpod.patch (text/plain), 4.61 KB, created by
Christopher Key
on 2010-07-15 16:10:04 UTC
(
hide
)
Description:
audio-gtkpod.patch
Filename:
MIME Type:
Creator:
Christopher Key
Created:
2010-07-15 16:10:04 UTC
Size:
4.61 KB
patch
obsolete
>Index: audio/gtkpod/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/gtkpod/Makefile,v >retrieving revision 1.55 >diff -u -r1.55 Makefile >--- audio/gtkpod/Makefile 6 Jun 2010 20:43:32 -0000 1.55 >+++ audio/gtkpod/Makefile 14 Jul 2010 20:19:00 -0000 >@@ -7,7 +7,7 @@ > > PORTNAME= gtkpod > PORTVERSION= 0.99.14 >-PORTREVISION= 6 >+PORTREVISION= 7 > CATEGORIES= audio > MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} > >@@ -40,11 +40,14 @@ > > .include <bsd.port.pre.mk> > >-.if defined(WITH_MPEG4IP) || exists(${LOCALBASE}/lib/libmp4v2.so) >-LIB_DEPENDS+= mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 >+.if defined(WITH_MPEG4IP) && !defined(WITHOUT_MPEG4IP) >+LIB_DEPENDS+= mp4v2.10:${PORTSDIR}/multimedia/mp4v2 >+CONFIGURE_ARGS+= --with-mp4v2 > # Define HAVE_GTK to unbreak the build with libmp4v2.so (it is built > # without Gtk support by default, which can result in gtkpod breakage) > MAKE_ARGS+= CPPFLAGS="-DHAVE_GTK" >+.else >+CONFIGURE_ARGS+= --without-mp4v2 > .endif > .for x in faac faad > . if exists(${LOCALBASE}/bin/${x}) >Index: audio/gtkpod/files/patch-src__mp4file.c >=================================================================== >RCS file: audio/gtkpod/files/patch-src__mp4file.c >diff -N audio/gtkpod/files/patch-src__mp4file.c >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ audio/gtkpod/files/patch-src__mp4file.c 14 Jul 2010 20:19:01 -0000 >@@ -0,0 +1,99 @@ >+--- ./src/mp4file.c.orig 2010-07-13 12:23:59.000000000 +0100 >++++ ./src/mp4file.c 2010-07-13 12:39:31.000000000 +0100 >+@@ -132,6 +132,8 @@ >+ /* define metadata bug is present (see note at mp4_write_file_info()) */ >+ #define MP4V2_HAS_METADATA_BUG TRUE >+ >++#define HAVE_LIBMP4V2_19X 1 >++ >+ #include <sys/types.h> >+ #include <sys/param.h> >+ #include <inttypes.h> >+@@ -399,7 +401,7 @@ >+ #else >+ #warning "Album Artist field not supported with this version of libmp4v2. Album Artist support requires at least V1.6.0" >+ #endif >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ if (MP4GetMetadataComposer(mp4File, &value) && value != NULL) >+ #else >+ if (MP4GetMetadataWriter(mp4File, &value) && value != NULL) >+@@ -413,7 +415,7 @@ >+ track->comment = charset_to_utf8 (value); >+ g_free(value); >+ } >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ if (MP4GetMetadataReleaseDate(mp4File, &value) && value != NULL) >+ #else >+ if (MP4GetMetadataYear(mp4File, &value) && value != NULL) >+@@ -447,7 +449,7 @@ >+ track->genre = charset_to_utf8 (value); >+ g_free(value); >+ } >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ if (MP4GetMetadataBPM (mp4File, &numvalue)) >+ #else >+ if (MP4GetMetadataTempo (mp4File, &numvalue)) >+@@ -541,7 +543,7 @@ >+ &m_track, &m_tracks); >+ gboolean has_disk = MP4GetMetadataDisk (mp4File, >+ &m_disk, &m_disks);*/ >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ gboolean has_tempo = MP4GetMetadataBPM (mp4File, >+ &m_tempo); >+ #else >+@@ -553,13 +555,13 @@ >+ /* MP4GetMetadataName (mp4File, &m_name); >+ MP4GetMetadataArtist (mp4File, &m_artist); >+ MP4GetMetadataAlbumArtist (mp4File, &m_albumartist); >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ MP4GetMetadataComposer (mp4File, &m_writer); >+ #else >+ MP4GetMetadataWriter (mp4File, &m_writer); >+ #endif >+ MP4GetMetadataComment (mp4File, &m_comment); >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ MP4GetMetadataReleaseDate (mp4File, &m_year); >+ #else >+ MP4GetMetadataYear (mp4File, &m_year); >+@@ -584,7 +586,7 @@ >+ g_free (value); >+ #endif >+ value = charset_from_utf8 (track->composer); >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ MP4SetMetadataComposer (mp4File, value); >+ #else >+ MP4SetMetadataWriter (mp4File, value); >+@@ -596,7 +598,7 @@ >+ g_free (value); >+ >+ value = g_strdup_printf ("%d", track->year); >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ MP4SetMetadataReleaseDate (mp4File, value); >+ #else >+ MP4SetMetadataYear (mp4File, value); >+@@ -611,7 +613,7 @@ >+ >+ MP4SetMetadataDisk (mp4File, track->cd_nr, track->cds); >+ >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ MP4SetMetadataBPM (mp4File, track->BPM); >+ #else >+ MP4SetMetadataTempo (mp4File, track->BPM); >+@@ -626,7 +628,7 @@ >+ g_free (value); >+ >+ #if MP4V2_HAS_METADATA_BUG >+-#if HAVE_LIBMP4V2_2 >++#if HAVE_LIBMP4V2_2 && !HAVE_LIBMP4V2_19X >+ if (has_tempo) MP4SetMetadataBPM (mp4File, m_tempo); >+ #else >+ if (has_tempo) MP4SetMetadataTempo (mp4File, m_tempo);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 148643
:
107820
|
107821
| 107822 |
107823
|
107824
|
107825
|
107826
|
107827