Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #277 from ertugerata/master

Browse Source 
musicbrainz5 in main with deps neon...
This commit is contained in:
Ertuğrul Erata
2015-08-20 15:49:19 +03:00
parent bf02aa88a6 1839c4f28f
commit c8d8cfe7ef
9 changed files with 439 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/misc/musicbrainz5/actions.py
+21
View File
@@ -0,0 +1,21 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import cmaketools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
cmaketools.configure()
def build():
cmaketools.make()
def install():
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("AUTHORS*", "COPYING*", "NEWS*", "README*")
multimedia/misc/musicbrainz5/files/libmusicbrainz-5.0.1-build_system-1.patch
+125
View File
@@ -0,0 +1,125 @@
Submitted By: Armin K. <krejzi at email dot com>
Date: 2012-09-01
Initial Package Version: 5.0.1
Upstream Status: Fixed upstream
Origin: Upstream
Description: Fixes out-of-source-tree build.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 3e11469..000d4aa 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,7 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include
+ ${CMAKE_CURRENT_BINARY_DIR}/../include
+)
LINK_LIBRARIES(musicbrainz5 ${NEON_LIBRARIES})
ADD_EXECUTABLE(cdlookup cdlookup.cc)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2ee102f..89ab63c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,10 @@
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../include ${NEON_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include
+ ${CMAKE_CURRENT_BINARY_DIR}/../include
+ ${NEON_INCLUDE_DIR}
+)
SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc
Disc.cc Entity.cc FreeDBDisc.cc HTTPFetch.cc ISRC.cc Label.cc LabelInfo.cc Lifespan.cc List.cc
@@ -13,7 +18,7 @@ ADD_EXECUTABLE(make-c-interface make-c-interface.cc xmlParser.cpp)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
DEPENDS make-c-interface cinterface.xml *.inc
)
diff --git a/src/make-c-interface.cc b/src/make-c-interface.cc
index 652a65b..70dd6d7 100644
--- a/src/make-c-interface.cc
+++ b/src/make-c-interface.cc
@@ -33,7 +33,7 @@
#include "musicbrainz5/xmlParser.h"
-void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include);
+void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include, const std::string& Path);
void ProcessHeader(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include);
void ProcessEntity(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include);
void ProcessClass(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include);
@@ -80,7 +80,7 @@ int main(int argc, const char *argv[])
std::string Name=Node.getName();
if ("boilerplate"==Name)
- ProcessBoilerplate(Node,Source,Include);
+ ProcessBoilerplate(Node,Source,Include,argv[1]);
else if ("header"==Name)
ProcessHeader(Node,Source,Include);
else if ("declare"==Name)
@@ -156,13 +156,13 @@ void ProcessHeader(const XMLNode& /*Node*/, std::ofstream& Source, std::ofstream
Include << os.str() << std::endl;
}
-void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include)
+void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include, const std::string& Path)
{
std::ofstream *File=GetFile(Node,Source,Include);
if (Node.isAttributeSet("file"))
{
- std::string FileName=Node.getAttribute("file");
+ std::string FileName=Path+"/"+Node.getAttribute("file");
std::ifstream InFile(FileName.c_str());
if (InFile.is_open())
*File << InFile.rdbuf() << std::endl;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 645f8ae..8a0b38b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,7 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include
+ ${CMAKE_CURRENT_BINARY_DIR}/../include
+)
LINK_LIBRARIES(musicbrainz5 ${NEON_LIBRARIES})
ADD_EXECUTABLE(mbtest mbtest.cc)
ADD_EXECUTABLE(ctest ctest.c)
--
1.7.10
From b5d4f4ea32068e296326438c747faf665c311ddd Mon Sep 17 00:00:00 2001
From: Andy Hawkins <andy@gently.org.uk>
Date: Thu, 14 Jun 2012 09:12:27 +0000
Subject: [PATCH] Fix install when building out of tree
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16870b4..958461c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
FILE(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/musicbrainz5/*.h)
-INSTALL(FILES ${headers} include/musicbrainz5/mb5_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz5)
+INSTALL(FILES ${headers} ${CMAKE_CURRENT_BINARY_DIR}/include/musicbrainz5/mb5_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz5)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
ADD_SUBDIRECTORY(src)
--
1.7.10
multimedia/misc/musicbrainz5/pspec.xml
+89
View File
@@ -0,0 +1,89 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>musicbrainz5</Name>
<Homepage>http://www.musicbrainz.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2.1</License>
<IsA>library</IsA>
<Summary>Client library to access metadata of mp3/vorbis/CD media</Summary>
<Description>MusicBrainz is a project that aims to create an open content music encyclopedia. It is an online database of information about recorded music. MusicBrainz client library captures information about artists, the album title, track titles,the length of each track and many more.</Description>
<Archive sha1sum="1576b474c777bb9c4ff906853ef1d3bb14915f50" type="targz">ftp://ftp.parrot.org/.1/blfs/svn/l/libmusicbrainz-5.1.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>neon-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies>
<!--Patches>
<Patch level="1">libmusicbrainz-5.0.1-build_system-1.patch</Patch>
</Patches-->
</Source>
<Package>
<Name>musicbrainz5</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>neon</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>musicbrainz5-devel</Name>
<Summary>Development files for musicbrainz5</Summary>
<RuntimeDependencies>
<Dependency release="current">musicbrainz5</Dependency>
<Dependency>neon-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2015-08-20</Date>
<Version>5.1.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2014-05-29</Date>
<Version>5.0.1</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-03-10</Date>
<Version>5.0.1</Version>
<Comment>Rebuild</Comment>
<Name>Varol Maksutoğlu</Name>
<Email>waroi@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-07-31</Date>
<Version>5.0.1</Version>
<Comment>missing dep</Comment>
<Name>Erdinç Gültekin</Name>
<Email>erdincgultekin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2013-01-06</Date>
<Version>5.0.1</Version>
<Comment>First release</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
</History>
</PISI>
multimedia/misc/musicbrainz5/translations.xml
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>musicbrainz5</Name>
<Summary xml:lang="tr">Mp3/Ogg Vorbis/Audio-Cd gibi ses dosyalarınızın etiketlerine erişiminizi sağlayan istemci kütüphanesidir.</Summary>
<Description xml:lang="tr">MusicBrainz açık içerikli müzik ansiklopedisi oluşturmayı amaçlayan bir projedir. Kayıtlı albüm ve müzik parçaları hakkında çevrim içi veri tabanı sağlar. MusicBrainz kütüphanesi sanatçı, albüm, çalınan parça ve daha birçok konuda veri toplar.</Description>
<Description xml:lang="fr">MusicBrainz est un projet tentant de créer une encyclopédie de musique au contenu ouvert. C'est une base de données en ligne contenant des informations concernant les musiques enregistrées. La librairie client MusicBrainz capture les informations concernant les artistes, le nom de l'album, les titres des chansons, leur longueur et beaucoup d'autres données encore.</Description>
<Description xml:lang="es">MusicBrainz es un proyecto con la finalidad de crear una enciclopedia de contenido abierto sobre música. Es una base de datos de información en línea sobre grabaciones de música. La libreía de cliente MusicBrainz captura información de artista, título de album, título de las músicas, longitudes de cada música, y mucho más.</Description>
</Source>
<Package>
<Name>musicbrainz5-devel</Name>
<Summary xml:lang="tr">musicbrainz5 için geliştirme dosyaları</Summary>
</Package>
</PISI>
network/misc/neon/actions.py
+28
View File
@@ -0,0 +1,28 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
autotools.configure("--with-libxml2 \
--with-expat \
--without-gssapi \
--without-libproxy \
--with-ssl=openssl \
--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \
--enable-threadsafe-ssl=posix \
--enable-shared \
--disable-static")
def build():
autotools.make()
def install():
autotools.install()
pisitools.dodoc("THANKS", "TODO", "ChangeLog", "AUTHORS", "BUGS", "NEWS", "README", "doc/*.txt")
network/misc/neon/files/fixdocdir.patch
+11
View File
@@ -0,0 +1,11 @@
--- Makefile.in.orig 2009-01-29 03:13:36.000000000 +0200
+++ Makefile.in 2009-05-02 03:14:18.000000000 +0300
@@ -22,7 +22,7 @@
man3dir = $(mandir)/man3
datarootdir = @datarootdir@
datadir = @datadir@
-docdir = $(datadir)/doc/neon-@NEON_VERSION@
+docdir = $(datadir)/doc/neon
includedir = @includedir@
neonincludes = $(includedir)/neon
pkgconfigdir = $(libdir)/pkgconfig
network/misc/neon/files/multilib.patch
+57
View File
@@ -0,0 +1,57 @@
--- neon-0.27.0/neon-config.in.multilib
+++ neon-0.27.0/neon-config.in
@@ -5,7 +5,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
-libdir=@libdir@
+
+libdir=`pkg-config --variable=libdir neon`
+CFLAGS=`pkg-config --cflags neon`
+LIBS=`pkg-config --libs neon`
+has_lfs=`pkg-config --variable=has_lfs neon`
usage()
{
@@ -23,7 +27,7 @@
--support FEATURE exit with success if feature is supported
Known features:
- dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@],
+ dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}],
i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@]
EOF
@@ -69,11 +73,10 @@
;;
--cflags)
- echo -I${includedir}/neon @NEON_CFLAGS@
+ echo ${CFLAGS}
;;
--libs)
- LIBS="-lneon @NEON_LIBS@"
# Don't add standard library paths
if test "$prefix" != "/usr"; then
LIBS="-L${libdir} ${LIBS}"
@@ -93,7 +96,7 @@
zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
dav|DAV) support @NE_FLAG_DAV@ ;;
- lfs|LFS) support @NE_FLAG_LFS@ ;;
+ lfs|LFS) support ${has_lfs} ;;
i18n|I18N) support @NE_FLAG_I18N@ ;;
ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;;
*) support no ;;
--- neon-0.27.0/neon.pc.in.multilib
+++ neon-0.27.0/neon.pc.in
@@ -2,6 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+has_lfs=@NE_FLAG_LFS@
Name: neon
Description: HTTP/WebDAV client library
network/misc/neon/pspec.xml
+79
View File
@@ -0,0 +1,79 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>neon</Name>
<Homepage>http://www.webdav.org/neon/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<Summary>HTTP and WebDAV client library</Summary>
<Description>neon is an HTTP and WebDAV client library with a C interface; providing a high-level interface to HTTP and WebDAV methods along with a low-level interface for HTTP request handling.</Description>
<Archive sha1sum="9e6297945226f90d66258b7ee05f757ff5cea10a" type="targz">http://www.webdav.org/neon/neon-0.30.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>openssl-devel</Dependency>
<Dependency>expat-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>mit-kerberos</Dependency>
</BuildDependencies>
<Patches>
<Patch>fixdocdir.patch</Patch>
<Patch level="1">multilib.patch</Patch>
</Patches>
</Source>
<Package>
<Name>neon</Name>
<RuntimeDependencies>
<Dependency>zlib</Dependency>
<Dependency>expat</Dependency>
<Dependency>openssl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>neon-devel</Name>
<Summary>Development files for neon</Summary>
<RuntimeDependencies>
<Dependency release="current">neon</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2014-05-25</Date>
<Version>0.30.0</Version>
<Comment>Rebuild.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2014-01-30</Date>
<Version>0.30.0</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-09-03</Date>
<Version>0.29.6</Version>
<Comment>First release</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
network/misc/neon/translations.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>neon</Name>
<Summary xml:lang="tr">C arayüzü ile birlikte gelen, Http ve WebDAV için istemci kitaplığı</Summary>
<Description xml:lang="tr">neon, C arayüzü sunan bir HTTP ve WebDAV istemci kitaplığıdır. HTTP ve WebDAV metodlarına yüksek seviyeli, HTTP istek değerlendirmesi için de düşük seviyeli bir arayüz sunar.</Description>
<Summary xml:lang="fr">Librairie cliente HTTP et WebDAV.</Summary>
</Source>
<Package>
<Name>neon-devel</Name>
<Summary xml:lang="tr">neon için geliştirme dosyaları</Summary>
</Package>
</PISI>