[f-spot] Require, but no longer include TagLib.

From: Stephen Shaw <sshaw src gnome org>
To: commits-list gnome org
Cc:
Subject: [f-spot] Require, but no longer include TagLib.
Date: Sat, 17 Sep 2011 19:56:08 +0000 (UTC)
commit 149abae4d291925a33faac821f31ea3414632e31
Author: Stephen Shaw <sshaw decriptor com>
Date:   Sat Sep 17 12:53:24 2011 -0600

    Require, but no longer include TagLib.

 F-Spot.sln                              |    9 -
 build/build.environment.mk              |    3 +-
 build/m4/f-spot/taglib.m4               |    5 +
 configure.ac                            |    4 +-
 lib/Makefile.am                         |   33 ----
 lib/TagLib/Makefile.am                  |   15 --
 lib/TagLib/TagLib                       |    1 -
 lib/TagLib/TagLib.csproj                |  273 -------------------------------
 lib/TagLib/sources.mk                   |  220 -------------------------
 src/Clients/MainApp/MainApp.csproj      |   49 ++----
 src/Core/FSpot.Gui/FSpot.Gui.csproj     |   20 +--
 src/Core/FSpot.Utils/FSpot.Utils.csproj |   23 +--
 12 files changed, 35 insertions(+), 620 deletions(-)
---
diff --git a/F-Spot.sln b/F-Spot.sln
index fe303b0..d5149d0 100644
--- a/F-Spot.sln
+++ b/F-Spot.sln
@@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena", "lib\Hyena\Hyena\Hy
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Data.Sqlite", "lib\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj", "{95374549-9553-4C1E-9D89-667755F90E13}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagLib", "lib\TagLib\TagLib.csproj", "{903D6440-A981-4B29-8825-7EB820684925}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Gui", "lib\Hyena\Hyena.Gui\Hyena.Gui.csproj", "{C856EFD8-E812-4E61-8B76-E3583D94C233}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Google", "lib\Mono.Google\Mono.Google.csproj", "{40C7D4EA-FB93-49FE-B18F-700A28C3E670}"
@@ -240,12 +238,6 @@ Global
 		{8EB3933F-A089-43A3-B662-617DC71A2173}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8EB3933F-A089-43A3-B662-617DC71A2173}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EB3933F-A089-43A3-B662-617DC71A2173}.Submodule|Any CPU.Build.0 = Debug|Any CPU
-		{903D6440-A981-4B29-8825-7EB820684925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{903D6440-A981-4B29-8825-7EB820684925}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{903D6440-A981-4B29-8825-7EB820684925}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{903D6440-A981-4B29-8825-7EB820684925}.Release|Any CPU.Build.0 = Release|Any CPU
-		{903D6440-A981-4B29-8825-7EB820684925}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
-		{903D6440-A981-4B29-8825-7EB820684925}.Submodule|Any CPU.Build.0 = Debug|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.Build.0 = Submodule|Any CPU
 		{95374549-9553-4C1E-9D89-667755F90E12}.Release|Any CPU.ActiveCfg = Debug|Any CPU
@@ -336,7 +328,6 @@ Global
 		{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
 		{95374549-9553-4C1E-9D89-667755F90E12} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
 		{95374549-9553-4C1E-9D89-667755F90E13} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
-		{903D6440-A981-4B29-8825-7EB820684925} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
 		{C856EFD8-E812-4E61-8B76-E3583D94C233} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
 		{40C7D4EA-FB93-49FE-B18F-700A28C3E670} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
 		{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 32d49c5..c64d642 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -17,7 +17,6 @@ DIR_SRC = $(top_builddir)/src
 DIR_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
 DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
-DIR_TAGLIB = $(top_builddir)/lib/TagLib
 DIR_BIN = $(top_builddir)/bin
 
 
@@ -64,7 +63,7 @@ LINK_HYENA_DEPS = $(REF_HYENA) $(LINK_HYENA)
 
 # TagLib
 REF_TAGLIB =
-LINK_TAGLIB = -r:$(DIR_BIN)/TagLib.dll
+LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
 LINK_TAGLIB_DEPS = $(REF_TAGLIB) $(LINK_TAGLIB)
 
 # Hyena.Data.Sqlite
diff --git a/build/m4/f-spot/taglib.m4 b/build/m4/f-spot/taglib.m4
new file mode 100644
index 0000000..26b84f7
--- /dev/null
+++ b/build/m4/f-spot/taglib.m4
@@ -0,0 +1,5 @@
+AC_DEFUN([FSPOT_CHECK_TAGLIB_SHARP],
+[
+        PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0.3.7)
+        AC_SUBST(TAGLIB_SHARP_LIBS)
+])
diff --git a/configure.ac b/configure.ac
index 4f5a9c2..6294c35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,9 @@ FSPOT_CHECK_MONO_ADDINS
 dnl -- dbus-sharp
 FSPOT_CHECK_DBUS_SHARP
 
+dnl -- taglib-sharp
+FSPOT_CHECK_TAGLIB_SHARP
+
 dnl --- libjpeg
 
 AC_CHECK_LIB(jpeg, jpeg_start_decompress, [],
@@ -328,7 +331,6 @@ lib/Makefile
 lib/Mono.Google/Makefile
 lib/Mono.Tabblo/Makefile
 lib/SmugMugNet/Makefile
-lib/TagLib/Makefile
 lib/unique-sharp/generator/Makefile
 lib/unique-sharp/Makefile
 lib/unique-sharp/unique/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d568927..30231a1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,40 +5,7 @@ SUBDIRS = \
 	gtk-sharp-beans		\
 	Hyena 				\
 	libfspot			\
-	TagLib 				\
 	unique-sharp 		\
 	Mono.Google 		\
 	Mono.Tabblo 		\
 	SmugMugNet
-
-
-### The stuff below takes care of embedding libraries. Build system hacks! ###
-TMPDIR_TAGLIB = /tmp/fetch_taglib
-
-clone-taglib:
-	mkdir $(TMPDIR_TAGLIB)
-	git clone --depth 1 git://gitorious.org/taglib-sharp/mainline.git $(TMPDIR_TAGLIB)
-	pushd $(TMPDIR_TAGLIB); git checkout -b photo-support origin/photo-support; popd
-
-
-update-taglib:
-	rm -rf TagLib/TagLib
-	cp -r $(TMPDIR_TAGLIB)/src/TagLib TagLib
-	echo "# This file is autogenerated, do not edit!" > TagLib/Makefile.am
-	echo "include \$$(top_srcdir)/Makefile.include" >> TagLib/Makefile.am
-	echo "ASSEMBLY_NAME = TagLib" >> TagLib/Makefile.am
-	echo >> TagLib/Makefile.am
-	echo "ASSEMBLY_SOURCES = \\" >> TagLib/Makefile.am
-	tail -n+2 TagLib/TagLib/TagLib.sources | sed s/\$$\(srcdir\)\\/// >> TagLib/Makefile.am
-	echo >> TagLib/Makefile.am
-	echo "ASSEMBLY = \$$(ASSEMBLY_NAME).dll" >> TagLib/Makefile.am
-	echo "all: \$$(ASSEMBLY)" >> TagLib/Makefile.am
-	echo "\$$(ASSEMBLY): \$$(ASSEMBLY_SOURCES)" >> TagLib/Makefile.am
-	echo "	\$$(CSC_LIB) \$$(CSC_DEFINES) -out:\$$@ \$$(ASSEMBLY_SOURCES)" >> TagLib/Makefile.am
-	echo >> TagLib/Makefile.am
-	echo "assemblydir = \$$(pkglibdir)" >> TagLib/Makefile.am
-	echo "assembly_DATA = \$$(ASSEMBLY)" >> TagLib/Makefile.am
-	echo "EXTRA_DIST = \$$(ASSEMBLY_SOURCES)" >> TagLib/Makefile.am
-	echo "CLEANFILES = \$$(ASSEMBLY) \$$(ASSEMBLY).mdb" >> TagLib/Makefile.am
-
-.PHONY: clone-taglib update-taglib
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index ef4b24f..5dbc696 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -9,7 +9,6 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>MainApp</RootNamespace>
     <AssemblyName>f-spot</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -296,46 +295,30 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System.Data" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="unique-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=22c19d4a5344e615">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\unique-sharp\unique\unique-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-      <Package>mono-addins</Package>
-    </Reference>
+    <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System" />
-    <Reference Include="Mono.Addins.Setup, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-      <Package>mono-addins-setup</Package>
+    <Reference Include="Mono.Addins.Setup, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="gnome-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+    <Reference Include="Mono.Simd" />
+    <Reference Include="unique-sharp">
+      <HintPath>..\..\..\lib\unique-sharp\unique\unique-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="gio-sharp">
       <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="gtk-sharp-beans, Version=2.14.0.0, Culture=neutral, PublicKeyToken=97a95fb57b03c03a">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
     </Reference>
-    <Reference Include="gnome-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gnome-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-      <Package>mono-addins-gui</Package>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <Package>mono-nunit</Package>
-    </Reference>
-    <Reference Include="Mono.Simd" />
-    <Reference Include="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="Mono.Cairo" />
+    <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\FSpot.Core\FSpot.Core.csproj">
@@ -350,10 +333,6 @@
       <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
       <Name>Hyena.Data.Sqlite</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\TagLib\TagLib.csproj">
-      <Project>{903D6440-A981-4B29-8825-7EB820684925}</Project>
-      <Name>TagLib</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Core\FSpot.JobScheduler\FSpot.JobScheduler.csproj">
       <Project>{46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}</Project>
       <Name>FSpot.JobScheduler</Name>
diff --git a/src/Core/FSpot.Gui/FSpot.Gui.csproj b/src/Core/FSpot.Gui/FSpot.Gui.csproj
index 4662fe0..28bf3ad 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui.csproj
+++ b/src/Core/FSpot.Gui/FSpot.Gui.csproj
@@ -9,7 +9,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>FSpot.Widgets</RootNamespace>
     <AssemblyName>FSpot.Gui</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -78,37 +77,30 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>glib-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Posix" />
     <Reference Include="gtk-sharp-beans, Version=2.14.0.0, Culture=neutral, PublicKeyToken=97a95fb57b03c03a">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+      <Package>gio-sharp-2.0</Package>
     </Reference>
     <Reference Include="System" />
     <Reference Include="Mono.Cairo" />
     <Reference Include="System.Core" />
+    <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FSpot.Utils\FSpot.Utils.csproj">
       <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
       <Name>FSpot.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\TagLib\TagLib.csproj">
-      <Project>{903D6440-A981-4B29-8825-7EB820684925}</Project>
-      <Name>TagLib</Name>
-    </ProjectReference>
     <ProjectReference Include="..\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
diff --git a/src/Core/FSpot.Utils/FSpot.Utils.csproj b/src/Core/FSpot.Utils/FSpot.Utils.csproj
index 3f49241..3128bdc 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils.csproj
+++ b/src/Core/FSpot.Utils/FSpot.Utils.csproj
@@ -9,7 +9,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>FSpot.Utils</RootNamespace>
     <AssemblyName>FSpot.Utils</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -78,31 +77,21 @@
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\TagLib\TagLib.csproj">
-      <Project>{903D6440-A981-4B29-8825-7EB820684925}</Project>
-      <Name>TagLib</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>glib-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+      <Package>gio-sharp-2.0</Package>
     </Reference>
     <Reference Include="Mono.Cairo" />
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System.Core" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <Package>mono-nunit</Package>
-    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+    <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]