Attachment 262 Details for Bug 346 – Partial patch to enable mp4 tagging

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Partial patch to enable mp4 tagging

amarok-mp4v2.diff (text/plain), 7.23 KB, created by Darrell on 2012-01-09 23:54:41 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-01-09 23:54:41 CST

Size: 7.23 KB

patch

obsolete

>diff -urN amarok/CMakeLists.txt amarok.new/CMakeLists.txt
>--- amarok/CMakeLists.txt	2011-05-03 17:01:35.000000000 -0500
>+++ amarok.new/CMakeLists.txt	2012-01-09 16:12:56.000000000 -0600
>@@ -53,6 +53,7 @@
> option( WITH_MTP "Enable mtp support" OFF )
> option( WITH_RIOKARMA "Enable riokarma support" OFF )
> option( WITH_DAAP "Enable daap support" OFF )
>+option( WITH_MP4V2 "Enable mp4v2 support" OFF )
> 
> 
> ##### user requested modules ####################
>diff -urN amarok/ConfigureChecks.cmake amarok.new/ConfigureChecks.cmake
>--- amarok/ConfigureChecks.cmake	2011-05-03 00:45:53.000000000 -0500
>+++ amarok.new/ConfigureChecks.cmake	2012-01-09 23:31:02.000000000 -0600
>@@ -173,3 +173,23 @@
>     tde_message_fatal( "konqsidebarplugin.h are requested, but not found on your system" )
>   endif( )
> endif( )
>+
>+##### check for mp4v2 ###########################
>+
>+if( WITH_MP4V2 )
>+  check_include_file( "mp4v2.h" MP4V2_FOUND )
>+  check_include_file( "mp4v2/mp4v2.h" MP4V2_MP4V2_FOUND )
>+  if( NOT MP4V2_FOUND )
>+    if( NOT MP4V2_MP4V2_FOUND )
>+      tde_message_fatal("MP4V2 support was requested, but not found on your system" )
>+    endif( NOT MP4V2_MP4V2_FOUND )
>+  endif( NOT MP4V2_FOUND )
>+  if( MP4V2_FOUND )
>+    set( HAVE_MP4V2 1 )
>+    INCLUDE_DIRECTORIES(${MP4V2_INCLUDE_DIRS})
>+  endif( MP4V2_FOUND )
>+  if( MP4V2_MP4V2_FOUND )
>+    set( HAVE_MP4V2 1 )
>+    INCLUDE_DIRECTORIES(${MP4V2_INCLUDE_DIRS})
>+  endif( MP4V2_MP4V2_FOUND )
>+endif( )
>diff -urN amarok/amarok/src/engine/helix/helix-engine.cpp amarok.new/amarok/src/engine/helix/helix-engine.cpp
>--- amarok/amarok/src/engine/helix/helix-engine.cpp	2011-08-17 15:59:43.000000000 -0500
>+++ amarok.new/amarok/src/engine/helix/helix-engine.cpp	2012-01-09 21:55:59.000000000 -0600
>@@ -15,6 +15,7 @@
> #include <climits>
> #include <cmath>
> #include <stdarg.h>
>+#include <cstring>
> 
> #include <config.h>
> 
>diff -urN amarok/amarok/src/engine/helix/helix-sp/helix-sp.h amarok.new/amarok/src/engine/helix/helix-sp/helix-sp.h
>--- amarok/amarok/src/engine/helix/helix-sp/helix-sp.h	2010-08-11 22:25:19.000000000 -0500
>+++ amarok.new/amarok/src/engine/helix/helix-sp/helix-sp.h	2012-01-09 21:55:07.000000000 -0600
>@@ -23,6 +23,7 @@
> #include <limits.h>
> #include <sys/param.h>
> #include <pthread.h>
>+#include <cstring>
> #include <vector>
> #include <config.h>
> #include <iostream>
>diff -urN amarok/amarok/src/engine/helix/hxplayercontrol.cpp amarok.new/amarok/src/engine/helix/hxplayercontrol.cpp
>--- amarok/amarok/src/engine/helix/hxplayercontrol.cpp	2011-08-17 15:59:43.000000000 -0500
>+++ amarok.new/amarok/src/engine/helix/hxplayercontrol.cpp	2012-01-09 21:54:13.000000000 -0600
>@@ -15,6 +15,8 @@
>  the alsa guys
>  ***************************************************************************/
> 
>+#include <cstdlib>
>+#include <cstring>
> #include <sys/time.h>
> #include <sys/types.h>
> #include <sys/wait.h>
>diff -urN amarok/amarok/src/metadata/mp4/CMakeLists.txt amarok.new/amarok/src/metadata/mp4/CMakeLists.txt
>--- amarok/amarok/src/metadata/mp4/CMakeLists.txt	1969-12-31 19:00:00.000000000 -0500
>+++ amarok.new/amarok/src/metadata/mp4/CMakeLists.txt	2012-01-09 23:39:44.000000000 -0600
>@@ -0,0 +1,29 @@
>+#################################################
>+#
>+#  (C) 2010-2011 Serghei Amelian
>+#  serghei (DOT) amelian (AT) gmail.com
>+#
>+#  Improvements and feedback are welcome
>+#
>+#  This file is released under GPL >= 2
>+#
>+#################################################
>+
>+include_directories(
>+  ${TDE_INCLUDE_DIR}
>+  ${TQT_INCLUDE_DIRS}
>+  ${TAGLIB_INCLUDE_DIRS}
>+  ${MP4V2_INCLUDE_DIRS}
>+)
>+
>+link_directories(
>+  ${MP4V2_INCLUDE_DIRS}
>+)
>+
>+
>+##### tagmp4 (static) ###########################
>+
>+tde_add_library( tagmp4 STATIC_PIC
>+  SOURCES
>+    mp4file.cpp mp4properties.cpp mp4tag.cpp taglib_mp4filetyperesolver.cpp
>+)
>diff -urN amarok/amarok/src/metadata/mp4/mp4file.cpp amarok.new/amarok/src/metadata/mp4/mp4file.cpp
>--- amarok/amarok/src/metadata/mp4/mp4file.cpp	2010-08-11 22:24:59.000000000 -0500
>+++ amarok.new/amarok/src/metadata/mp4/mp4file.cpp	2012-01-09 23:26:57.000000000 -0600
>@@ -30,6 +30,7 @@
> #include <audioproperties.h>
> 
> #include <stdint.h>
>+#include <cstdlib>
> 
> #define MP4V2_HAS_WRITE_BUG 1
> 
>diff -urN amarok/amarok/src/metadata/mp4/mp4file.h amarok.new/amarok/src/metadata/mp4/mp4file.h
>--- amarok/amarok/src/metadata/mp4/mp4file.h	2010-08-11 22:24:59.000000000 -0500
>+++ amarok.new/amarok/src/metadata/mp4/mp4file.h	2012-01-09 23:45:03.000000000 -0600
>@@ -25,6 +25,15 @@
> #include <tfile.h>
> #include "mp4properties.h"
> 
>+typedef signed int int32_t;
>+typedef unsigned int u_int32_t;
>+
>+typedef signed short int16_t;
>+typedef unsigned short u_int16_t;
>+
>+typedef signed char int8_t;
>+typedef unsigned char u_int8_t;
>+
> namespace TagLib { 
> 
>     namespace MP4 {
>diff -urN amarok/amarok/src/metadata/mp4/mp4properties.cpp amarok.new/amarok/src/metadata/mp4/mp4properties.cpp
>--- amarok/amarok/src/metadata/mp4/mp4properties.cpp	2010-08-11 22:24:59.000000000 -0500
>+++ amarok.new/amarok/src/metadata/mp4/mp4properties.cpp	2012-01-09 23:26:41.000000000 -0600
>@@ -20,16 +20,17 @@
>  ***************************************************************************/
> 
> #include "mp4properties.h"
>-
>+#include "mp4file.h"
> 
> #include <tstring.h>
> 
>-#include <config.h>
> #ifdef HAVE_SYSTEMS_H
> #include <systems.h>
> #endif
> 
> #include <stdint.h>
>+#include <stdlib.h>
>+#include <string.h>
> 
> #ifndef UINT64_TO_DOUBLE
> #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
>diff -urN amarok/amarok/src/metadata/mp4/mp4properties.h amarok.new/amarok/src/metadata/mp4/mp4properties.h
>--- amarok/amarok/src/metadata/mp4/mp4properties.h	2010-08-11 22:24:59.000000000 -0500
>+++ amarok.new/amarok/src/metadata/mp4/mp4properties.h	2012-01-09 23:26:49.000000000 -0600
>@@ -24,11 +24,11 @@
> 
> #include <audioproperties.h>
> #include <tstring.h>
>-#include <mp4.h>
>-// mp4.h drags in mp4_config.h that defines these
>-// get rid of them so they don't conflict with our config.h
>-#undef VERSION
>-#undef PACKAGE
>+#include <mp4v2/mp4v2.h>
>+#include <mp4v2/file.h>
>+#include <mp4v2/meta.h>
>+#include <mp4v2/track_prop.h>
>+#include <mp4v2/track.h>
> 
> namespace TagLib {
> 
>diff -urN amarok/amarok/src/metadata/mp4/mp4tag.cpp amarok.new/amarok/src/metadata/mp4/mp4tag.cpp
>--- amarok/amarok/src/metadata/mp4/mp4tag.cpp	2010-08-11 22:24:59.000000000 -0500
>+++ amarok.new/amarok/src/metadata/mp4/mp4tag.cpp	2012-01-09 23:27:17.000000000 -0600
>@@ -24,6 +24,7 @@
> 
> #include <tag.h>
> #include <stdint.h>
>+#include <cstdlib>
> 
> using namespace TagLib;
> 
>diff -urN amarok/amarok/src/metadata/mp4/mp4tag.h amarok.new/amarok/src/metadata/mp4/mp4tag.h
>--- amarok/amarok/src/metadata/mp4/mp4tag.h	2010-08-11 22:24:59.000000000 -0500
>+++ amarok.new/amarok/src/metadata/mp4/mp4tag.h	2012-01-09 23:45:43.000000000 -0600
>@@ -23,7 +23,6 @@
> 
> #include <tag.h>
> #include "mp4file.h"
>-#include <mp4.h>
> 
> namespace TagLib {
> 
>diff -urN amarok/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp amarok.new/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
>--- amarok/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp	2010-08-11 22:24:59.000000000 -0500
>+++ amarok.new/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp	2012-01-09 23:37:33.000000000 -0600
>@@ -24,6 +24,7 @@
> 
> #include "taglib_mp4filetyperesolver.h"
> #include "mp4file.h"
>+#include <cstring>
> 
> TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
>         bool readProperties,

Actions: View | Diff

Attachments on bug 346: 262 | 900 | 1149 | 1264 | 1266 | 1267 | 1268 | 1269 | 1270