Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/musicbrainz/patches/musicbrainz-4.0.3-support-out-of-source-build.patch

    Annotation of /trunk/musicbrainz/patches/musicbrainz-4.0.3-support-out-of-source-build.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1910 - (hide annotations) (download)
    Fri Oct 12 11:50:12 2012 UTC (11 years, 8 months ago) by niro
    File size: 5056 byte(s) 
    -build fixes
    1 niro 1910 diff -Naur libmusicbrainz-4.0.3/CMakeLists.txt libmusicbrainz-4.0.3-magellan/CMakeLists.txt
    2     --- libmusicbrainz-4.0.3/CMakeLists.txt 2012-05-16 21:45:56.000000000 +0200
    3     +++ libmusicbrainz-4.0.3-magellan/CMakeLists.txt 2012-10-12 15:53:27.567982326 +0200
    4     @@ -32,7 +32,7 @@
    5     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
    6    
    7     FILE(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/musicbrainz4/*.h)
    8     -INSTALL(FILES ${headers} include/musicbrainz4/mb4_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz4)
    9     +INSTALL(FILES ${headers} ${CMAKE_CURRENT_BINARY_DIR}/include/musicbrainz4/mb4_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz4)
    10     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz4.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
    11    
    12     ADD_SUBDIRECTORY(src)
    13     diff -Naur libmusicbrainz-4.0.3/examples/CMakeLists.txt libmusicbrainz-4.0.3-magellan/examples/CMakeLists.txt
    14     --- libmusicbrainz-4.0.3/examples/CMakeLists.txt 2012-05-16 21:45:56.000000000 +0200
    15     +++ libmusicbrainz-4.0.3-magellan/examples/CMakeLists.txt 2012-10-12 15:46:18.649984633 +0200
    16     @@ -1,4 +1,7 @@
    17     -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
    18     +INCLUDE_DIRECTORIES(
    19     + ${CMAKE_CURRENT_SOURCE_DIR}/../include
    20     + ${CMAKE_CURRENT_BINARY_DIR}/../include
    21     +)
    22     LINK_LIBRARIES(musicbrainz4 ${NEON_LIBRARIES})
    23    
    24     ADD_EXECUTABLE(cdlookup cdlookup.cc)
    25     diff -Naur libmusicbrainz-4.0.3/src/CMakeLists.txt libmusicbrainz-4.0.3-magellan/src/CMakeLists.txt
    26     --- libmusicbrainz-4.0.3/src/CMakeLists.txt 2012-05-16 21:45:56.000000000 +0200
    27     +++ libmusicbrainz-4.0.3-magellan/src/CMakeLists.txt 2012-10-12 15:49:26.858983101 +0200
    28     @@ -1,5 +1,10 @@
    29     SET(CMAKE_INCLUDE_CURRENT_DIR ON)
    30     -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../include ${NEON_INCLUDE_DIR})
    31     +INCLUDE_DIRECTORIES(
    32     + ${CMAKE_CURRENT_SOURCE_DIR}/..
    33     + ${CMAKE_CURRENT_SOURCE_DIR}/../include
    34     + ${CMAKE_CURRENT_BINARY_DIR}/../include
    35     + ${NEON_INCLUDE_DIR}
    36     +)
    37    
    38     SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc
    39     Disc.cc Entity.cc FreeDBDisc.cc HTTPFetch.cc ISRC.cc Label.cc LabelInfo.cc Lifespan.cc List.cc
    40     @@ -14,6 +19,7 @@
    41     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz4/mb4_c.h
    42     COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb4_c.cc mb4_c.h
    43     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz4
    44     + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz4/mb4_c.h
    45     DEPENDS make-c-interface cinterface.xml *.inc
    46     )
    47    
    48     diff -Naur libmusicbrainz-4.0.3/src/make-c-interface.cc libmusicbrainz-4.0.3-magellan/src/make-c-interface.cc
    49     --- libmusicbrainz-4.0.3/src/make-c-interface.cc 2012-05-16 21:45:56.000000000 +0200
    50     +++ libmusicbrainz-4.0.3-magellan/src/make-c-interface.cc 2012-10-12 15:51:38.934985357 +0200
    51     @@ -33,7 +33,7 @@
    52    
    53     #include "musicbrainz4/xmlParser.h"
    54    
    55     -void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include);
    56     +void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include, const std::string& Path);
    57     void ProcessHeader(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include);
    58     void ProcessEntity(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include);
    59     void ProcessClass(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include);
    60     @@ -80,7 +80,7 @@
    61     std::string Name=Node.getName();
    62    
    63     if ("boilerplate"==Name)
    64     - ProcessBoilerplate(Node,Source,Include);
    65     + ProcessBoilerplate(Node,Source,Include,argv[1]);
    66     else if ("header"==Name)
    67     ProcessHeader(Node,Source,Include);
    68     else if ("declare"==Name)
    69     @@ -156,13 +156,13 @@
    70     Include << os.str() << std::endl;
    71     }
    72    
    73     -void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include)
    74     +void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include, const std::string& Path)
    75     {
    76     std::ofstream *File=GetFile(Node,Source,Include);
    77    
    78     if (Node.isAttributeSet("file"))
    79     {
    80     - std::string FileName=Node.getAttribute("file");
    81     + std::string FileName=Path+"/"+Node.getAttribute("file");
    82     std::ifstream InFile(FileName.c_str());
    83     if (InFile.is_open())
    84     *File << InFile.rdbuf() << std::endl;
    85     diff -Naur libmusicbrainz-4.0.3/tests/CMakeLists.txt libmusicbrainz-4.0.3-magellan/tests/CMakeLists.txt
    86     --- libmusicbrainz-4.0.3/tests/CMakeLists.txt 2012-05-16 21:45:56.000000000 +0200
    87     +++ libmusicbrainz-4.0.3-magellan/tests/CMakeLists.txt 2012-10-12 15:52:02.656983150 +0200
    88     @@ -1,4 +1,7 @@
    89     -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
    90     +INCLUDE_DIRECTORIES(
    91     + ${CMAKE_CURRENT_SOURCE_DIR}/../include
    92     + ${CMAKE_CURRENT_BINARY_DIR}/../include
    93     +)
    94     LINK_LIBRARIES(musicbrainz4 ${NEON_LIBRARIES})
    95     ADD_EXECUTABLE(mbtest mbtest.cc)
    96     ADD_EXECUTABLE(ctest ctest.c)