libid3tag dependency and remove libid3tag and libapetag #1450

Merged
merged 2 commits into from Oct 5, 2012
Jump to file
The table of contents is too big for display.
+26 −73,736
Split
View
@@ -181,8 +181,6 @@ LIB_DIRS=\
lib/cximage-6.0 \
lib/libexif \
lib/libhdhomerun \
- lib/libid3tag \
- lib/libapetag \
lib/cpluff \
lib/xbmc-dll-symbols
@@ -307,8 +305,6 @@ $(NWAOBJSXBMC): force
$(DIRECTORY_ARCHIVES): force
@$(MAKE) $(if $(V),,-s) -C $(@D)
-lib/libapetag/.libs/libapetag.a: force
- $(MAKE) -C lib/libapetag
lib/cpluff/libcpluff/.libs/libcpluff.a: force
$(MAKE) -C lib/cpluff/libcpluff
system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a exports
@@ -363,8 +359,6 @@ cmyth: dllloader
$(MAKE) -C lib/cmyth
libhdhomerun: dllloader
$(MAKE) -C lib/libhdhomerun
-libid3tag: dllloader
- $(MAKE) -C lib/libid3tag
papcodecs: dllloader dvdpcodecs
test -d system/players/paplayer || mkdir system/players/paplayer
$(MAKE) -C lib/xbadpcm
@@ -393,20 +387,18 @@ endif
codecs: papcodecs dvdpcodecs
-libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
+libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
externals: codecs libs visualizations screensavers libaddon pvraddons
xcode_depends: \
codecs libs visualizations screensavers eventclients skins libaddon \
lib/libsquish/libsquish.a \
- lib/libapetag/.libs/libapetag.a \
lib/libRTV/librtv.a \
lib/libXDAAP/libxdaap.a \
lib/SlingboxLib/SlingboxLib.a
OBJSXBMC =$(DIRECTORY_ARCHIVES)
-OBJSXBMC+=lib/libapetag/.libs/libapetag.a
DYNOBJSXBMC= \
xbmc/linux/linux.a \
@@ -132,7 +132,6 @@
18B7C7FB1294222E009E7A26 /* VisibleEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7A61294222E009E7A26 /* VisibleEffect.cpp */; };
18B7C7FC1294222E009E7A26 /* XBTF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7A71294222E009E7A26 /* XBTF.cpp */; };
18B7C7FD1294222E009E7A26 /* XBTFReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7A81294222E009E7A26 /* XBTFReader.cpp */; };
- 18B7C88E129423A7009E7A26 /* Id3Tag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C859129423A7009E7A26 /* Id3Tag.cpp */; };
18B7C890129423A7009E7A26 /* MusicInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C85E129423A7009E7A26 /* MusicInfoTag.cpp */; };
18B7C893129423A7009E7A26 /* MusicInfoTagLoaderASAP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C864129423A7009E7A26 /* MusicInfoTagLoaderASAP.cpp */; };
18B7C894129423A7009E7A26 /* MusicInfoTagLoaderCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C866129423A7009E7A26 /* MusicInfoTagLoaderCDDA.cpp */; };
@@ -1258,9 +1257,6 @@
18B7C7A61294222E009E7A26 /* VisibleEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisibleEffect.cpp; sourceTree = "<group>"; };
18B7C7A71294222E009E7A26 /* XBTF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBTF.cpp; sourceTree = "<group>"; };
18B7C7A81294222E009E7A26 /* XBTFReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBTFReader.cpp; sourceTree = "<group>"; };
- 18B7C859129423A7009E7A26 /* Id3Tag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Id3Tag.cpp; sourceTree = "<group>"; };
- 18B7C85A129423A7009E7A26 /* Id3Tag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Id3Tag.h; sourceTree = "<group>"; };
- 18B7C85B129423A7009E7A26 /* id3v1genre.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = id3v1genre.h; sourceTree = "<group>"; };
18B7C85C129423A7009E7A26 /* ImusicInfoTagLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImusicInfoTagLoader.h; sourceTree = "<group>"; };
18B7C85E129423A7009E7A26 /* MusicInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTag.cpp; sourceTree = "<group>"; };
18B7C85F129423A7009E7A26 /* MusicInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTag.h; sourceTree = "<group>"; };
@@ -1385,7 +1381,6 @@
38F4E56E13CCCB3B00664821 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
430C881312D64A730098821A /* IPowerSyscall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IPowerSyscall.h; sourceTree = "<group>"; };
431376FF12D6455C00680C15 /* GUIDialogCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogCache.h; sourceTree = "<group>"; };
- 4313777F12D648E900680C15 /* DllLibid3tag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibid3tag.h; sourceTree = "<group>"; };
431AE5D7109C1A63007428C3 /* OverlayRendererUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OverlayRendererUtil.cpp; sourceTree = "<group>"; };
431AE5D8109C1A63007428C3 /* OverlayRendererUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlayRendererUtil.h; sourceTree = "<group>"; };
432D7CE212D86D8B00CE4C49 /* NetworkLinux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkLinux.h; sourceTree = "<group>"; };
@@ -3601,10 +3596,6 @@
18B7C854129423A7009E7A26 /* tags */ = {
isa = PBXGroup;
children = (
- 4313777F12D648E900680C15 /* DllLibid3tag.h */,
- 18B7C859129423A7009E7A26 /* Id3Tag.cpp */,
- 18B7C85A129423A7009E7A26 /* Id3Tag.h */,
- 18B7C85B129423A7009E7A26 /* id3v1genre.h */,
18B7C85C129423A7009E7A26 /* ImusicInfoTagLoader.h */,
18B7C85E129423A7009E7A26 /* MusicInfoTag.cpp */,
18B7C85F129423A7009E7A26 /* MusicInfoTag.h */,
@@ -7395,7 +7386,6 @@
18B7C7FB1294222E009E7A26 /* VisibleEffect.cpp in Sources */,
18B7C7FC1294222E009E7A26 /* XBTF.cpp in Sources */,
18B7C7FD1294222E009E7A26 /* XBTFReader.cpp in Sources */,
- 18B7C88E129423A7009E7A26 /* Id3Tag.cpp in Sources */,
18B7C890129423A7009E7A26 /* MusicInfoTag.cpp in Sources */,
18B7C893129423A7009E7A26 /* MusicInfoTagLoaderASAP.cpp in Sources */,
18B7C894129423A7009E7A26 /* MusicInfoTagLoaderCDDA.cpp in Sources */,
View
@@ -2316,7 +2316,6 @@ OUTPUT_FILES="Makefile \
lib/cmyth/Makefile \
lib/libhdhomerun/Makefile \
lib/libsquish/Makefile \
- lib/libid3tag/Makefile \
lib/cximage-6.0/Makefile \
lib/addons/script.module.pil/Makefile \
lib/libUPnP/Makefile \
@@ -2633,20 +2632,6 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
--cc="$CC"
], [0])
-XB_CONFIG_MODULE([lib/libid3tag/libid3tag],[
- ./configure \
- CC="$CC" \
- CXX="$CXX" \
- CFLAGS="$CFLAGS" \
- CXXFLAGS="$CXXFLAGS" \
- --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
- --host=$host_alias \
- --build=$build_alias \
- --target=$target_alias \
- --disable-static \
- --with-pic
-], [0])
-
XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
set -x
rm -f CMakeCache.txt && \
@@ -2708,15 +2693,6 @@ XB_CONFIG_MODULE([xbmc/screensavers/rsxs-0.9/], [
fi
], [$DISABLE_RSXS])
-XB_CONFIG_MODULE([lib/libapetag], [
- ./configure \
- `if test "$host_vendor" = "apple"; then echo --disable-shared; fi` \
- --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
- --host=$host_alias \
- --build=$build_alias \
- --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX"
-], [0])
-
XB_CONFIG_MODULE([lib/cpluff], [
./configure --disable-nls \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
@@ -1 +0,0 @@
-Artur Polaczynski (Ar't)
Oops, something went wrong.