Author: qboosh Date: Sat Mar 26 21:11:39 2011 GMT Module: packages Tag: HEAD ---- Log message: - added link patch (fixes inter-library linking, except for SWRender, which I didn't check)
---- Files affected: packages/ClanLib: ClanLib.spec (1.129 -> 1.130) , ClanLib-link.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: packages/ClanLib/ClanLib.spec diff -u packages/ClanLib/ClanLib.spec:1.129 packages/ClanLib/ClanLib.spec:1.130 --- packages/ClanLib/ClanLib.spec:1.129 Sat Mar 26 14:11:51 2011 +++ packages/ClanLib/ClanLib.spec Sat Mar 26 22:11:34 2011 @@ -22,6 +22,7 @@ Source0: http://www.clanlib.org/download/releases-2.0/%{name}-%{version}.tgz # Source0-md5: a6207ce394e60151c61aa5ad99de336d Patch0: %{name}-build.patch +Patch1: %{name}-link.patch URL: http://www.clanlib.org/ BuildRequires: OpenGL-GLU-devel BuildRequires: alsa-lib-devel @@ -316,6 +317,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %{__rm} -r autom4te.cache @@ -557,6 +559,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.130 2011/03/26 21:11:34 qboosh +- added link patch (fixes inter-library linking, except for SWRender, which I didn't check) + Revision 1.129 2011/03/26 13:11:51 qboosh - separated SWRender libs - don't use sse2 instructions on CPUs not supporting it (pentium4 or x86_64) ================================================================ Index: packages/ClanLib/ClanLib-link.patch diff -u /dev/null packages/ClanLib/ClanLib-link.patch:1.4 --- /dev/null Sat Mar 26 22:11:40 2011 +++ packages/ClanLib/ClanLib-link.patch Sat Mar 26 22:11:34 2011 @@ -0,0 +1,219 @@ +--- ClanLib-2.2.7/Sources/Core/Makefile.am.orig 2010-07-19 09:10:06.000000000 +0200 ++++ ClanLib-2.2.7/Sources/Core/Makefile.am 2011-03-26 14:43:21.808912129 +0100 +@@ -164,7 +164,7 @@ + endif + + # FIXME: Hardcoding these here might not be a good idea +-libclan22Core_la_LIBADD = @LIBPTHREAD@ ++libclan22Core_la_LIBADD = @LIBPTHREAD@ -lpthread + + libclan22Core_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ +--- ClanLib-2.2.7/Sources/Network/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100 ++++ ClanLib-2.2.7/Sources/Network/Makefile.am 2011-03-26 14:55:17.676908777 +0100 +@@ -45,9 +45,10 @@ + setupnetwork_unix.cpp + endif + ++libclan22Network_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la + libclan22Network_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ +- $(extra_LIBS_Network) ++ $(extra_LIBS_clanNetwork) + + libclan22Sound_la_CXXFLAGS=$(Network_CXXFLAGS) $(extra_CFLAGS_Network) + +--- ClanLib-2.2.7/Sources/Sound/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 ++++ ClanLib-2.2.7/Sources/Sound/Makefile.am 2011-03-26 14:45:51.348911291 +0100 +@@ -55,6 +55,7 @@ + SoundProviders/Unix/soundprovider_recorder_oss.h + endif + ++libclan22Sound_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la + libclan22Sound_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanSound) +--- ClanLib-2.2.7/Sources/CSSLayout/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 ++++ ClanLib-2.2.7/Sources/CSSLayout/Makefile.am 2011-03-26 14:47:45.184912129 +0100 +@@ -380,6 +380,7 @@ + precomp.cpp \ + precomp.h + ++libclan22CSSLayout_la_LIBADD = $(top_builddir)/Sources/Display/libclan22Display.la $(top_builddir)/Sources/Core/libclan22Core.la + libclan22CSSLayout_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanCSSLayout) +--- ClanLib-2.2.7/Sources/RegExp/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 ++++ ClanLib-2.2.7/Sources/RegExp/Makefile.am 2011-03-26 14:49:19.388910453 +0100 +@@ -5,9 +5,10 @@ + regexp.cpp \ + regexp_match.cpp + ++libclan22RegExp_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la + libclan22RegExp_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ +- $(extra_LIBS_RegExp) ++ $(extra_LIBS_clanRegExp) + + libclan22Sound_la_CXXFLAGS=$(RegExp_CXXFLAGS) $(extra_CFLAGS_RegExp) + +--- ClanLib-2.2.7/Sources/MikMod/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 ++++ ClanLib-2.2.7/Sources/MikMod/Makefile.am 2011-03-26 14:51:37.044906262 +0100 +@@ -8,11 +8,11 @@ + soundprovider_mikmod.cpp \ + soundprovider_mikmod_session.cpp + +-libclan22MikMod_la_LIBADD = -lmikmod ++libclan22MikMod_la_LIBADD = $(top_builddir)/Sources/Sound/libclan22Sound.la $(top_builddir)/Sources/Core/libclan22Core.la -lmikmod + + libclan22MikMod_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ +- $(extra_LIBS_MikMod) ++ $(extra_LIBS_clanMikMod) + + libclan22Sound_la_CXXFLAGS=$(MikMod_CXXFLAGS) $(extra_CFLAGS_MikMod) + +--- ClanLib-2.2.7/Sources/GL1/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100 ++++ ClanLib-2.2.7/Sources/GL1/Makefile.am 2011-03-26 14:55:25.660907939 +0100 +@@ -41,6 +41,7 @@ + GLX/gl1_window_provider_glx.cpp \ + GLX/gl1_window_provider_glx.h + endif ++libclan22GL1_la_LIBADD = $(top_builddir)/Sources/Display/libclan22Display.la $(top_builddir)/Sources/Core/libclan22Core.la + libclan22GL1_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanGL1) +--- ClanLib-2.2.7/Sources/GL/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100 ++++ ClanLib-2.2.7/Sources/GL/Makefile.am 2011-03-26 14:57:45.268909615 +0100 +@@ -48,6 +48,7 @@ + GLX/opengl_window_provider_glx.cpp \ + GLX/opengl_window_provider_glx.h + endif ++libclan22GL_la_LIBADD = $(top_builddir)/Sources/Display/libclan22Display.la $(top_builddir)/Sources/Core/libclan22Core.la + libclan22GL_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanGL) +--- ClanLib-2.2.7/Sources/Vorbis/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 ++++ ClanLib-2.2.7/Sources/Vorbis/Makefile.am 2011-03-26 14:59:38.508911291 +0100 +@@ -5,11 +5,11 @@ + soundprovider_vorbis.cpp \ + soundprovider_vorbis_session.cpp + +-libclan22Vorbis_la_LIBADD = -logg -lvorbis ++libclan22Vorbis_la_LIBADD = $(top_builddir)/Sources/Sound/libclan22Sound.la $(top_builddir)/Sources/Core/libclan22Core.la -logg -lvorbis + + libclan22Vorbis_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ +- $(extra_LIBS_Vorbis) ++ $(extra_LIBS_clanVorbis) + + libclan22Sound_la_CXXFLAGS=$(Vorbis_CXXFLAGS) $(extra_CFLAGS_Vorbis) + +--- ClanLib-2.2.7/Sources/Database/Makefile.am.orig 2010-11-01 09:26:08.000000000 +0100 ++++ ClanLib-2.2.7/Sources/Database/Makefile.am 2011-03-26 15:00:40.788912129 +0100 +@@ -8,6 +8,7 @@ + db_value.cpp \ + db_transaction.cpp + ++libclan22Database_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la + libclan22Database_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanDatabase) +--- ClanLib-2.2.7/Sources/App/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 ++++ ClanLib-2.2.7/Sources/App/Makefile.am 2011-03-26 15:01:37.480908777 +0100 +@@ -6,6 +6,7 @@ + libclan22App_la_SOURCES = Unix/clanapp.cpp + endif + ++libclan22App_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la + libclan22App_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanApp) +--- ClanLib-2.2.7/Sources/GUI/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 ++++ ClanLib-2.2.7/Sources/GUI/Makefile.am 2011-03-26 15:04:04.180909615 +0100 +@@ -112,6 +112,7 @@ + gui_theme_default_impl.h \ + precomp.h + ++libclan22GUI_la_LIBADD = $(top_builddir)/Sources/CSSLayout/libclan22CSSLayout.la $(top_builddir)/Sources/Display/libclan22Display.la $(top_builddir)/Sources/Core/libclan22Core.la + libclan22GUI_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanGUI) +--- ClanLib-2.2.7/Sources/Sqlite/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 ++++ ClanLib-2.2.7/Sources/Sqlite/Makefile.am 2011-03-26 15:06:37.852907938 +0100 +@@ -9,9 +9,10 @@ + sqlite_reader_provider.cpp \ + sqlite_transaction_provider.cpp + ++libclan22Sqlite_la_LIBADD = $(top_builddir)/Sources/Database/libclan22Database.la $(top_builddir)/Sources/Core/libclan22Core.la -lpthread + libclan22Sqlite_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ +- $(extra_LIBS_Sqlite) ++ $(extra_LIBS_clanSqlite) + + libclan22Sound_la_CXXFLAGS=$(Sqlite_CXXFLAGS) $(extra_CFLAGS_Sqlite) + +--- ClanLib-2.2.7/Sources/Display/Makefile.am.orig 2011-03-26 20:24:07.184910453 +0100 ++++ ClanLib-2.2.7/Sources/Display/Makefile.am 2011-03-26 20:25:43.388909615 +0100 +@@ -1,6 +1,7 @@ + lib_LTLIBRARIES = libclan22Display.la + + if WIN32 ++libclan22Display_la_LIBADD = + else + libclan22Display_la_LIBADD = -lpng -ljpeg + endif +@@ -182,6 +183,7 @@ + X11/font_config.cpp \ + X11/font_config.h + endif ++libclan22Display_la_LIBADD += $(top_builddir)/Sources/Core/libclan22Core.la $(clanDisplay_LIBS) + libclan22Display_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ + $(extra_LIBS_clanDisplay) +--- ClanLib-2.2.7/configure.ac.orig 2011-01-27 09:46:22.000000000 +0100 ++++ ClanLib-2.2.7/configure.ac 2011-03-26 15:25:57.540910453 +0100 +@@ -631,9 +631,14 @@ + dnl Set the include path + CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources" + ++ClanLib_Modules= ++ClanLib_pkgconfig= ++ClanLib_API_Modules= + dnl Modules which will be build +-ClanLib_Modules="App" +-ClanLib_pkgconfig="clanApp.pc" ++CLANLIB_ENABLE_MODULES(Core) ++ ++ClanLib_Modules="$ClanLib_Modules App" ++ClanLib_pkgconfig="$ClanLib_pkgconfig clanApp.pc" + + dnl API header files for the Modules which will be installed + ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)" +@@ -641,7 +646,6 @@ + dnl Default examples which will be build + dnl (Currently Disabled) + ClanLib_Examples="" +-CLANLIB_ENABLE_MODULES(Core) + + if test "$enable_clanDisplay" = "yes"; then + CLANLIB_ENABLE_MODULES(Display) +@@ -670,14 +674,14 @@ + CLANLIB_ENABLE_MODULES(GL1) + fi + +-if test "$enable_clanGUI" = "yes"; then +- CLANLIB_ENABLE_MODULES(GUI) +-fi +- + if test "$enable_clanCSSLayout" = "yes"; then + CLANLIB_ENABLE_MODULES(CSSLayout) + fi + ++if test "$enable_clanGUI" = "yes"; then ++ CLANLIB_ENABLE_MODULES(GUI) ++fi ++ + if test "$enable_clanSWRender" = "yes"; then + CLANLIB_ENABLE_MODULES(SWRender) + fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ClanLib/ClanLib.spec?r1=1.129&r2=1.130&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ClanLib/ClanLib-link.patch?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
