diff --git a/desktop/gnome/base/cogl/actions.py b/desktop/gnome/base/cogl/actions.py deleted file mode 100644 index 0d0037a76f..0000000000 --- a/desktop/gnome/base/cogl/actions.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/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 get -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools - -def setup(): - autotools.autoreconf("-vfi") - autotools.configure("\ - --disable-static \ - --with-pic \ - --enable-introspection=yes \ - --enable-cairo=yes \ - --enable-gdk-pixbuf=yes \ - --enable-cogl-pango=yes \ - --enable-glx=yes \ - --enable-gles1=yes \ - --enable-gles2=yes \ - --enable-wayland-egl-platform \ - --enable-wayland-egl-server \ - ") - - pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") - -def build(): - autotools.make() - -def install(): - autotools.install() - - pisitools.dodoc("COPYING", "README") - diff --git a/desktop/gnome/base/cogl/files/git-fixes.patch b/desktop/gnome/base/cogl/files/git-fixes.patch deleted file mode 100644 index bb0178fbb6..0000000000 --- a/desktop/gnome/base/cogl/files/git-fixes.patch +++ /dev/null @@ -1,1242 +0,0 @@ -diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt -index 72e25b0..13303df 100644 ---- a/build/win32/vs10/README.txt -+++ b/build/win32/vs10/README.txt -@@ -5,7 +5,7 @@ its dependencies can be found on the following GNOME Live! page: - - https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - --Please do not attempt to compile COGL in a path that contains spaces -+Please do not attempt to compile Cogl in a path that contains spaces - to avoid potential problems during compilation, linking or usage. - - This VS10 solution and the projects it includes are intented to be used -@@ -18,7 +18,10 @@ You will need the parts from GNOME: GDK-Pixbuf, Pango* and GLib. - External dependencies are at least zlib, libpng, - gettext-runtime* and Cairo*, and glext.h from - http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder --in your include directories or in \vs10\\include\GL). -+in your include directories or in \vs10\\include\GL). Please -+note that although the Cogl source package does allow one to build Cogl without -+a previously built and installed GLib, the Visual Studio projects only support -+builds that does depend on GLib. - - Please see the README file in the root directory of this Cogl source package - for the versions of the dependencies required. See also -@@ -27,11 +30,16 @@ where to unpack them. It is recommended that at least the dependencies - from GNOME are also built with VS10 to avoid crashes caused by mixing different - CRTs-please see also the build/win32/vs10/README.txt in those respective packages. - --If building the SDL winsys is desired, you will also need the SDL libraries --from www.libsdl.org-building the SDL source package with Visual C++ 2010 --is recommended (working Visual C++ 2005 projects are included with it, upgrade --the projects one prompted), but one may want to use the VC8 binary packages --from that website. -+If building the SDL2 winsys is desired (the *_SDL configs), you will also need the -+SDL2 libraries from www.libsdl.org-building the SDL source package with Visual C++ 2010 -+is recommended via CMake, but one may want to use the Visual C++ binary packages -+from that website. Since Cogl-1.18.x, the Visual Studio Projects have been updated -+to support the build of the SDL2 winsys in place of the original SDL-1.3 winsys -+as SDL-2.x has been released for some time. Please note, as builds with the SDL2 -+winsys includes the SDL2 headers, main() will be defined to SDL2's special main() -+implementation on Windows, which will require linking to SDL2.lib and SDL2main.lib -+for all apps that link to Cogl, unless SDL_MAIN_HANDLED is defined in your -+"preprocessor definitions" options. - - The recommended build sequence of the dependencies are as follows (the non-GNOME - packages that are not downloaded as binaries from ftp://ftp.gnome.org have -@@ -46,9 +54,10 @@ in the next unstable release): - -libpng - -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is - recommended-please see build/win32/vs10/README.txt in the GLib source package) ---(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG -+-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG or libjpeg-turbo - -(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library] ---(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff -+-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG/libjpeg-turbo) -+ libtiff - -GLib - -Cairo - -Pango -diff --git a/build/win32/vs10/cogl-build-defines.props b/build/win32/vs10/cogl-build-defines.props -index 27b2e4c..eefe1a6 100644 ---- a/build/win32/vs10/cogl-build-defines.props -+++ b/build/win32/vs10/cogl-build-defines.props -@@ -11,6 +11,7 @@ - G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir" - G_LOG_DOMAIN="CoglPath" - G_LOG_DOMAIN="Cogl-Pango" -+ SDL_MAIN_HANDLED - - - <_PropertySheetDisplayName>coglbuilddefinesprops -@@ -51,5 +52,8 @@ - - $(CoglPangoBuildDefines) - -+ -+ $(CoglAppAvoidForcedSDLLinkingDefines) -+ - - -diff --git a/build/win32/vs10/cogl-crate.vcxproj b/build/win32/vs10/cogl-crate.vcxproj -index a64e669..d99a487 100644 ---- a/build/win32/vs10/cogl-crate.vcxproj -+++ b/build/win32/vs10/cogl-crate.vcxproj -@@ -75,7 +75,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -94,7 +94,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -118,7 +118,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -137,7 +137,7 @@ - - - -- COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - -diff --git a/build/win32/vs10/cogl-gen-srcs.props b/build/win32/vs10/cogl-gen-srcs.props -index b68b92c..0ec0e63 100644 ---- a/build/win32/vs10/cogl-gen-srcs.props -+++ b/build/win32/vs10/cogl-gen-srcs.props -@@ -48,15 +48,15 @@ cd $(SolutionDir) - - - echo EXPORTS > $(DefDir)\cogl.def --cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def -+cl -EP -DCOGL_HAS_GTYPE_SUPPORT -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def - - - echo EXPORTS > $(DefDir)\cogl.def --cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def -+cl -EP -DCOGL_HAS_GTYPE_SUPPORT -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def - - - echo EXPORTS > $(DefDir)\cogl-path.def --cl -EP ..\..\..\cogl-path\cogl-path.symbols >> $(DefDir)\cogl-path.def -+cl -EP -DCOGL_HAS_GTYPE_SUPPORT ..\..\..\cogl-path\cogl-path.symbols >> $(DefDir)\cogl-path.def - - - echo EXPORTS > $(DefDir)\cogl-pango.def -diff --git a/build/win32/vs10/cogl-hello.vcxproj b/build/win32/vs10/cogl-hello.vcxproj -index 4b6c732..a754c0d 100644 ---- a/build/win32/vs10/cogl-hello.vcxproj -+++ b/build/win32/vs10/cogl-hello.vcxproj -@@ -75,7 +75,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -93,7 +93,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - -@@ -110,7 +110,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -130,7 +130,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -diff --git a/build/win32/vs10/cogl-info.vcxproj b/build/win32/vs10/cogl-info.vcxproj -index 17b3ba8..45f75ff 100644 ---- a/build/win32/vs10/cogl-info.vcxproj -+++ b/build/win32/vs10/cogl-info.vcxproj -@@ -75,7 +75,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -93,7 +93,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -116,7 +116,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -134,7 +134,7 @@ - - - -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - -diff --git a/build/win32/vs10/cogl-msaa.vcxproj b/build/win32/vs10/cogl-msaa.vcxproj -index 4518872..28de260 100644 ---- a/build/win32/vs10/cogl-msaa.vcxproj -+++ b/build/win32/vs10/cogl-msaa.vcxproj -@@ -75,7 +75,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -93,7 +93,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -116,7 +116,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -134,7 +134,7 @@ - - - -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - -diff --git a/build/win32/vs10/test-conformance-cogl.vcxprojin b/build/win32/vs10/test-conformance-cogl.vcxprojin -index 753a188..a4aded6 100644 ---- a/build/win32/vs10/test-conformance-cogl.vcxprojin -+++ b/build/win32/vs10/test-conformance-cogl.vcxprojin -@@ -76,7 +76,7 @@ - - Disabled - ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -96,7 +96,7 @@ - - Disabled - ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -121,7 +121,7 @@ - MaxSpeed - ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) - true -- COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -141,7 +141,7 @@ - - - ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) -- COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - -diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt -index cd1695d..f277f97 100644 ---- a/build/win32/vs9/README.txt -+++ b/build/win32/vs9/README.txt -@@ -5,7 +5,7 @@ its dependencies can be found on the following GNOME Live! page: - - https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - --Please do not attempt to compile COGL in a path that contains spaces -+Please do not attempt to compile Cogl in a path that contains spaces - to avoid potential problems during compilation, linking or usage. - - This VS9 solution and the projects it includes are intented to be used -@@ -14,31 +14,33 @@ first need to use some Unix-like environment or manual work to expand - the files needed, like config.h.win32.in into config.h.win32 and the - .vcprojin files here into corresponding actual .vcproj files. - --Decide whether you want to build the SDL winsys with your COGL build, and --use one of the .sln for building COGL (note that both will build the Windows --OpenGL (WGL) winsys): ---cogl.sln for building COGL without the SDL winsys ---cogl_sdl.sln for building COGL with the SDL winsys -- - You will need the parts from GNOME: GDK-Pixbuf, Pango* and GLib. - External dependencies are at least zlib, libpng, - gettext-runtime* and Cairo*, and glext.h from - http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder --in your include directories or in \vs9\\include\GL). -+in your include directories or in \vs9\\include\GL). Please -+note that although the Cogl source package does allow one to build Cogl without -+a previously built and installed GLib, the Visual Studio projects only support -+builds that does depend on GLib. - --As Cogl 1.99.x and later will now use C99 types in lieu of GLib types, a --compatible implementation of stdint.h for Visual C++ is required, such --as the one from http://code.google.com/p/msinttypes/, so one would need --to download and extract the .zip file from that website and extract stdint.h --into \vs9\\include or somewhere where it can be -+As Cogl use C99 types in lieu of GLib types, a compatible implementation of -+stdint.h for Visual C++ is required, such as the one from -+http://code.google.com/p/msinttypes/, so one would need to download and extract -+the .zip file from that website and extract stdint.h into -+\vs9\\include or somewhere where it can be found - automatically found by the compiler. Note that Visual C++ 2010 and later - ships with stdint.h, so it is only required for Visual C++ 2008 builds. - --If building the SDL winsys is desired, you will also need the SDL libraries --from www.libsdl.org-building the SDL source package with Visual C++ 2008 --is recommended (working Visual C++ 2005 projects are included with it, upgrade --the projects one prompted), but one may want to use the VC8 binary packages --from that website. -+If building the SDL2 winsys is desired (the *_SDL configs), you will also need the -+SDL2 libraries from www.libsdl.org-building the SDL source package with Visual C++ 2008 -+is recommended via CMake, but one may want to use the Visual C++ binary packages -+from that website. Since Cogl-1.18.x, the Visual Studio Projects have been updated -+to support the build of the SDL2 winsys in place of the original SDL-1.3 winsys -+as SDL-2.x has been released for some time. Please note, as builds with the SDL2 -+winsys includes the SDL2 headers, main() will be defined to SDL2's special main() -+implementation on Windows, which will require linking to SDL2.lib and SDL2main.lib -+for all apps that link to Cogl, unless SDL_MAIN_HANDLED is defined in your -+"preprocessor definitions" options. - - Please see the README file in the root directory of this Cogl source package - for the versions of the dependencies required. See also -@@ -60,9 +62,10 @@ in the next unstable release): - -libpng - -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is - recommended-please see build/win32/vs9/README.txt in the GLib source package) ---(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG -+-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG or libjpeg-turbo - -(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library] ---(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff -+-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG/libjpeg-turbo) -+ libtiff - -GLib - -Cairo - -Pango -@@ -75,15 +78,13 @@ built DLLs go into \vs9\\bin, built LIBs into - \vs9\\include\Cogl-2.0. - - *There is no known official VS9 build support for fontconfig -- (required for Pango and Pango at the moment-I will see whether this -- requirement can be made optional for VS builds) - (along with freetype and expat) and gettext-runtime, so - please use the binaries from: - - ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit) - ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit) - --Note: If you see C4819 warnings and you are compiling Cogl on a DBCS -+Note: If you see C4819 errors and you are compiling Cogl on a DBCS - (Chinese/Korean/Japanese) version of Windows, you may need to switch - to an English locale in Control Panel->Region and Languages->System-> - Change System Locale, reboot and rebuild to ensure Cogl and its -diff --git a/build/win32/vs9/cogl-build-defines.vsprops b/build/win32/vs9/cogl-build-defines.vsprops -index fc68d47..5fc6282 100644 ---- a/build/win32/vs9/cogl-build-defines.vsprops -+++ b/build/win32/vs9/cogl-build-defines.vsprops -@@ -46,4 +46,8 @@ - Name="CoglPangoBuildDefines" - Value="G_LOG_DOMAIN=\"Cogl-Pango\"" - /> -+ - -diff --git a/build/win32/vs9/cogl-crate.vcproj b/build/win32/vs9/cogl-crate.vcproj -index 0fa2382..359289c 100644 ---- a/build/win32/vs9/cogl-crate.vcproj -+++ b/build/win32/vs9/cogl-crate.vcproj -@@ -31,7 +31,7 @@ - - - - - - - - atlases; l; l = l->next) -- /* Try to make some space in the atlas for the texture */ -- if (_cogl_atlas_reserve_space (atlas = l->data, -- /* Add two pixels for the border */ -- width + 2, height + 2, -- atlas_tex)) -- { -- cogl_object_ref (atlas); -- break; -- } -+ { -+ /* We need to take a reference on the atlas before trying to -+ * reserve space because in some circumstances atlas migration -+ * can cause the atlas to be freed */ -+ atlas = cogl_object_ref (l->data); -+ /* Try to make some space in the atlas for the texture */ -+ if (_cogl_atlas_reserve_space (atlas, -+ /* Add two pixels for the border */ -+ width + 2, height + 2, -+ atlas_tex)) -+ { -+ /* keep the atlas reference */ -+ break; -+ } -+ else -+ { -+ cogl_object_unref (atlas); -+ } -+ } - - /* If we couldn't find a suitable atlas then start another */ - if (l == NULL) -diff --git a/cogl/cogl-gtype-private.h b/cogl/cogl-gtype-private.h -index 03832ef..8498385 100644 ---- a/cogl/cogl-gtype-private.h -+++ b/cogl/cogl-gtype-private.h -@@ -133,9 +133,9 @@ cogl_##name##_get_gtype (void) \ - return type_id__volatile; \ - } - --#define COGL_GTYPE_DEFINE_BASE_CLASS(Name,name,interfaces...) \ -- _COGL_GTYPE_DEFINE_BASE_CLASS_BEGIN(Name,name) \ -- {interfaces;} \ -+#define COGL_GTYPE_DEFINE_BASE_CLASS(Name,name,...) \ -+ _COGL_GTYPE_DEFINE_BASE_CLASS_BEGIN(Name,name) \ -+ {__VA_ARGS__;} \ - _COGL_GTYPE_DEFINE_BASE_CLASS_END() - - #define _COGL_GTYPE_DEFINE_INTERFACE_EXTENDED_BEGIN(Name,name) \ -@@ -230,7 +230,7 @@ cogl_##name##_get_gtype (void) \ - } /* closes name##_get_type() */ - - --#define COGL_GTYPE_DEFINE_CLASS(Name,name,interfaces...) \ -+#define COGL_GTYPE_DEFINE_CLASS(Name,name,...) \ - typedef struct _Cogl##Name##Class Cogl##Name##Class; \ - struct _Cogl##Name##Class { \ - CoglObjectClass parent_class; \ -@@ -239,7 +239,7 @@ cogl_##name##_get_gtype (void) \ - cogl_##name, \ - cogl_object_get_gtype(), \ - 0) \ -- {interfaces;} \ -+ {__VA_ARGS__;} \ - _COGL_GTYPE_DEFINE_TYPE_EXTENDED_END() \ - static void \ - cogl_##name##_init (Cogl##Name *instance) \ -diff --git a/cogl/cogl-sdl.h b/cogl/cogl-sdl.h -index 220e004..44d308d 100644 ---- a/cogl/cogl-sdl.h -+++ b/cogl/cogl-sdl.h -@@ -52,15 +52,6 @@ - #include - #include - --#ifdef _MSC_VER --/* We need to link to SDL.lib/SDLmain.lib -- * if we are using Cogl -- * that uses the SDL winsys -- */ --#pragma comment (lib, "SDL.lib") --#pragma comment (lib, "SDLmain.lib") --#endif -- - COGL_BEGIN_DECLS - - /** -diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols -index d1eb319..c48314a 100644 ---- a/cogl/cogl.symbols -+++ b/cogl/cogl.symbols -@@ -4,14 +4,25 @@ - cogl_android_set_native_window - #endif - --/* cogl-atlas-texture.h */ -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_atlas_texture_get_gtype -+#endif - cogl_atlas_texture_new_with_size - cogl_atlas_texture_new_from_file - cogl_atlas_texture_new_from_data - cogl_atlas_texture_new_from_bitmap - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_attribute_buffer_get_gtype -+#endif - cogl_attribute_buffer_new_with_size - -+cogl_attribute_buffer_new -+cogl_attribute_get_buffer -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_attribute_get_gtype -+#endif -+cogl_attribute_get_normalized - cogl_attribute_new - cogl_attribute_new_const_1f - cogl_attribute_new_const_2f -@@ -23,9 +34,6 @@ cogl_attribute_new_const_3x3fv - cogl_attribute_new_const_4f - cogl_attribute_new_const_4fv - cogl_attribute_new_const_4x4fv --cogl_attribute_buffer_new --cogl_attribute_get_buffer --cogl_attribute_get_normalized - cogl_attribute_set_buffer - cogl_attribute_set_normalized - cogl_attribute_type_get_type -@@ -35,6 +43,9 @@ cogl_begin_gl - cogl_bitmap_error_get_type - cogl_bitmap_get_buffer - cogl_bitmap_get_format -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_bitmap_get_gtype -+#endif - cogl_bitmap_get_height - cogl_bitmap_get_rowstride - cogl_bitmap_get_size_from_file -@@ -111,6 +122,9 @@ cogl_color_get_blue_float - cogl_color_get_green - cogl_color_get_green_byte - cogl_color_get_green_float -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_color_get_gtype -+#endif - cogl_color_get_red - cogl_color_get_red_byte - cogl_color_get_red_float -@@ -149,6 +163,9 @@ cogl_glx_context_get_glx_context - #endif - - cogl_context_get_display -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_context_get_gtype -+#endif - cogl_context_get_renderer - cogl_context_new - -@@ -172,6 +189,9 @@ cogl_depth_test_function_get_type - - cogl_disable_fog - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_display_get_gtype -+#endif - cogl_display_get_renderer - cogl_display_new - cogl_display_setup -@@ -188,6 +208,9 @@ cogl_error_matches - cogl_euler_copy - cogl_euler_equal - cogl_euler_free -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_euler_get_gtype -+#endif - cogl_euler_init - cogl_euler_init_from_matrix - #if 0 -@@ -239,6 +262,9 @@ cogl_framebuffer_get_depth_texture_enabled - cogl_framebuffer_get_depth_write_enabled - cogl_framebuffer_get_dither_enabled - cogl_framebuffer_get_green_bits -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_framebuffer_get_gtype -+#endif - cogl_framebuffer_get_height - cogl_framebuffer_get_modelview_matrix - cogl_framebuffer_get_projection_matrix -@@ -284,7 +310,14 @@ cogl_framebuffer_translate - cogl_framebuffer_vdraw_attributes - /* cogl_framebuffer_vdraw_indexed_attributes */ /* Not Implemented! */ - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_frame_closure_get_gtype -+#endif - cogl_frame_info_get_frame_counter -+ -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_frame_info_get_gtype -+#endif - cogl_frame_info_get_output - cogl_frame_info_get_presentation_time - cogl_frame_info_get_refresh_rate -@@ -311,6 +344,9 @@ cogl_get_static_identity_quaternion - cogl_get_static_zero_quaternion - cogl_get_viewport - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_gles2_context_get_gtype -+#endif - cogl_gles2_context_get_vtable - cogl_gles2_context_new - cogl_gles2_get_current_vtable -@@ -322,8 +358,8 @@ cogl_glib_renderer_source_new - cogl_glib_source_new - #endif - --#ifdef _COGL_SUPPORTS_GTYPE_INTEGRATION --/* cogl_gtype_matrix_get_type */ /* Not Implemented */ -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_gtype_matrix_get_type - #endif - - cogl_handle_get_type -@@ -333,8 +369,14 @@ cogl_handle_unref - cogl_has_feature - cogl_has_features - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_index_buffer_get_gtype -+#endif - cogl_index_buffer_new - cogl_indices_get_buffer -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_indices_get_gtype -+#endif - cogl_indices_get_offset - cogl_indices_get_type - cogl_indices_new -@@ -448,6 +490,9 @@ cogl_matrix_copy - cogl_matrix_entry_calculate_translation - cogl_matrix_entry_equal - cogl_matrix_entry_get -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_matrix_entry_get_gtype -+#endif - cogl_matrix_entry_is_identity - cogl_matrix_entry_ref - cogl_matrix_entry_unref -@@ -455,6 +500,9 @@ cogl_matrix_equal - cogl_matrix_free - cogl_matrix_frustum - cogl_matrix_get_array -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_matrix_get_gtype -+#endif - cogl_matrix_get_inverse - cogl_matrix_init_from_array - cogl_matrix_init_translation -@@ -481,6 +529,9 @@ cogl_matrix_scale - cogl_matrix_stack_frustum - cogl_matrix_stack_get - cogl_matrix_stack_get_entry -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_matrix_stack_get_gtype -+#endif - cogl_matrix_stack_get_inverse - cogl_matrix_stack_load_identity - cogl_matrix_stack_multiply -@@ -504,11 +555,17 @@ cogl_matrix_view_2d_in_perspective - - cogl_meta_texture_foreach_in_region - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_object_get_gtype -+#endif - cogl_object_get_user_data - cogl_object_ref - cogl_object_set_user_data - cogl_object_unref - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_offscreen_get_gtype -+#endif - cogl_offscreen_new_to_texture - cogl_offscreen_new_with_texture - -@@ -519,8 +576,14 @@ cogl_onscreen_add_swap_buffers_callback - #ifndef COGL_WINSYS_INTEGRATED - cogl_onscreen_clutter_backend_set_size_CLUTTER - #endif -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_onscreen_dirty_closure_get_gtype -+#endif - cogl_onscreen_get_buffer_age - cogl_onscreen_get_frame_counter -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_onscreen_get_gtype -+#endif - cogl_onscreen_get_resizable - cogl_onscreen_hide - cogl_onscreen_new -@@ -529,18 +592,27 @@ cogl_onscreen_remove_dirty_callback - cogl_onscreen_remove_frame_callback - cogl_onscreen_remove_resize_callback - cogl_onscreen_remove_swap_buffers_callback -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_onscreen_resize_closure_get_gtype -+#endif - cogl_onscreen_set_resizable - cogl_onscreen_set_swap_throttled - cogl_onscreen_show - cogl_onscreen_swap_buffers - cogl_onscreen_swap_buffers_with_damage - cogl_onscreen_swap_region -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_onscreen_template_get_gtype -+#endif - cogl_onscreen_template_new - cogl_onscreen_template_set_samples_per_pixel - cogl_onscreen_template_set_swap_throttled - - cogl_ortho - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_output_get_gtype -+#endif - cogl_output_get_height - cogl_output_get_mm_height - cogl_output_get_mm_width -@@ -566,6 +638,9 @@ cogl_pipeline_get_depth_state - cogl_pipeline_get_diffuse - cogl_pipeline_get_emission - cogl_pipeline_get_front_face_winding -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_pipeline_get_gtype -+#endif - cogl_pipeline_get_layer_mag_filter - cogl_pipeline_get_layer_min_filter - cogl_pipeline_get_layer_point_sprite_coords_enabled -@@ -618,6 +693,9 @@ cogl_pipeline_set_uniform_1f - cogl_pipeline_set_uniform_1i - cogl_pipeline_set_user_program - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_pixel_buffer_get_gtype -+#endif - cogl_pixel_buffer_new - #if 0 - /* not exported in the main APIs for now */ -@@ -641,6 +719,9 @@ cogl_pop_source - cogl_primitive_copy - cogl_primitive_foreach_attribute - cogl_primitive_get_first_vertex -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_primitive_get_gtype -+#endif - cogl_primitive_get_indices - cogl_primitive_get_mode - cogl_primitive_get_n_vertices -@@ -701,6 +782,9 @@ cogl_quaternion_copy - cogl_quaternion_dot_product - cogl_quaternion_equal - cogl_quaternion_free -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_quaternion_get_gtype -+#endif - cogl_quaternion_get_rotation_angle - cogl_quaternion_get_rotation_axis - cogl_quaternion_init -@@ -733,6 +817,9 @@ cogl_renderer_check_onscreen_template - cogl_renderer_connect - cogl_renderer_foreach_output - cogl_renderer_get_driver -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_renderer_get_gtype -+#endif - cogl_renderer_get_n_fragment_texture_units - cogl_renderer_error_get_type - cogl_renderer_get_winsys_id -@@ -793,6 +880,9 @@ cogl_snippet_get_hook - cogl_snippet_get_post - cogl_snippet_get_pre - cogl_snippet_get_replace -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_snippet_get_gtype -+#endif - cogl_snippet_new - cogl_snippet_set_declarations - cogl_snippet_set_post -@@ -801,9 +891,15 @@ cogl_snippet_set_replace - - cogl_sqrti - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_sub_texture_get_gtype -+#endif - cogl_sub_texture_get_parent - cogl_sub_texture_new - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_swap_chain_get_gtype -+#endif - cogl_swap_chain_new - cogl_swap_chain_set_has_alpha - cogl_swap_chain_set_length -@@ -811,12 +907,16 @@ cogl_swap_chain_set_length - cogl_system_error_get_type - - cogl_texture_allocate -+cogl_texture_components_get_type - cogl_texture_error_get_type - cogl_texture_flags_get_type - cogl_texture_get_components - cogl_texture_get_data - cogl_texture_get_format - cogl_texture_get_gl_texture -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_get_gtype -+#endif - cogl_texture_get_height - cogl_texture_get_max_waste - cogl_texture_get_premultiplied -@@ -831,11 +931,17 @@ cogl_texture_new_from_sub_texture - cogl_texture_new_with_size - #ifdef COGL_HAS_X11 - cogl_texture_pixmap_x11_error_domain -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_pixmap_x11_get_gtype -+#endif - cogl_texture_pixmap_x11_is_using_tfp_extension - cogl_texture_pixmap_x11_new - cogl_texture_pixmap_x11_set_damage_object - cogl_texture_pixmap_x11_update_area - #endif -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_rectangle_get_gtype -+#endif - cogl_texture_rectangle_new_from_bitmap - cogl_texture_rectangle_new_from_foreign - cogl_texture_rectangle_new_with_size -@@ -851,14 +957,23 @@ cogl_texture_type_get_type - #ifndef COGL_DISABLE_DEPRECATED - cogl_texture_unref - #endif -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_2d_get_gtype -+#endif - cogl_texture_2d_new_from_bitmap - cogl_texture_2d_new_from_data - cogl_texture_2d_new_from_file - cogl_texture_2d_new_with_size -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_2d_sliced_get_gtype -+#endif - cogl_texture_2d_sliced_new_from_bitmap - cogl_texture_2d_sliced_new_from_data - cogl_texture_2d_sliced_new_from_file - cogl_texture_2d_sliced_new_with_size -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_3d_get_gtype -+#endif - cogl_texture_3d_new_from_bitmap - cogl_texture_3d_new_from_data - cogl_texture_3d_new_with_size -diff --git a/cogl/deprecated/cogl-framebuffer-deprecated.h b/cogl/deprecated/cogl-framebuffer-deprecated.h -index 2ac29b1..68ed9d3 100644 ---- a/cogl/deprecated/cogl-framebuffer-deprecated.h -+++ b/cogl/deprecated/cogl-framebuffer-deprecated.h -@@ -33,6 +33,8 @@ - - #include - -+COGL_BEGIN_DECLS -+ - /** - * cogl_set_framebuffer: - * @buffer: A #CoglFramebuffer object, either onscreen or offscreen. -@@ -257,4 +259,6 @@ COGL_DEPRECATED_IN_1_18 - CoglPixelFormat - cogl_framebuffer_get_color_format (CoglFramebuffer *framebuffer); - -+COGL_END_DECLS -+ - #endif /* __COGL_FRAMEBUFFER_DEPRECATED_H__ */ -diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c -index 8c4176e..ec54095 100644 ---- a/cogl/winsys/cogl-winsys-egl-kms.c -+++ b/cogl/winsys/cogl-winsys-egl-kms.c -@@ -196,6 +196,31 @@ free_current_bo (CoglOnscreen *onscreen) - } - - static void -+queue_swap_notify_for_onscreen (CoglOnscreen *onscreen) -+{ -+ CoglOnscreenEGL *egl_onscreen = onscreen->winsys; -+ CoglOnscreenKMS *kms_onscreen = egl_onscreen->platform; -+ CoglContext *context = COGL_FRAMEBUFFER (onscreen)->context; -+ CoglRenderer *renderer = context->display->renderer; -+ CoglRendererEGL *egl_renderer = renderer->winsys; -+ CoglRendererKMS *kms_renderer = egl_renderer->platform; -+ -+ /* We only want to notify that the swap is complete when the -+ * application calls cogl_context_dispatch so instead of -+ * immediately notifying we queue an idle callback */ -+ if (!kms_renderer->swap_notify_idle) -+ { -+ kms_renderer->swap_notify_idle = -+ _cogl_poll_renderer_add_idle (renderer, -+ flush_pending_swap_notify_idle, -+ context, -+ NULL); -+ } -+ -+ kms_onscreen->pending_swap_notify = TRUE; -+} -+ -+static void - page_flip_handler (int fd, - unsigned int frame, - unsigned int sec, -@@ -217,19 +242,7 @@ page_flip_handler (int fd, - CoglRendererEGL *egl_renderer = renderer->winsys; - CoglRendererKMS *kms_renderer = egl_renderer->platform; - -- /* We only want to notify that the swap is complete when the -- * application calls cogl_context_dispatch so instead of -- * immediately notifying we queue an idle callback */ -- if (!kms_renderer->swap_notify_idle) -- { -- kms_renderer->swap_notify_idle = -- _cogl_poll_renderer_add_idle (renderer, -- flush_pending_swap_notify_idle, -- context, -- NULL); -- } -- -- kms_onscreen->pending_swap_notify = TRUE; -+ queue_swap_notify_for_onscreen (onscreen); - - free_current_bo (onscreen); - -@@ -283,12 +296,6 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer, - egl_renderer->platform = g_slice_new0 (CoglRendererKMS); - kms_renderer = egl_renderer->platform; - -- /* The EGL API doesn't provide for a way to explicitly select a -- * platform when the driver can support multiple. Mesa allows -- * selection using an environment variable though so that's what -- * we're doing here... */ -- g_setenv ("EGL_PLATFORM", "drm", 1); -- - kms_renderer->fd = -1; - kms_renderer->opened_fd = -1; - -@@ -909,6 +916,8 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen, - kms_onscreen->next_fb_id = 0; - g_slice_free (CoglFlipKMS, flip); - flip = NULL; -+ -+ queue_swap_notify_for_onscreen (onscreen); - } - else - { -diff --git a/cogl/winsys/cogl-winsys-egl-wayland.c b/cogl/winsys/cogl-winsys-egl-wayland.c -index c631080..2b359cb 100644 ---- a/cogl/winsys/cogl-winsys-egl-wayland.c -+++ b/cogl/winsys/cogl-winsys-egl-wayland.c -@@ -242,12 +242,6 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer, - - egl_renderer->platform_vtable = &_cogl_winsys_egl_vtable; - -- /* The EGL API doesn't provide for a way to explicitly select a -- * platform when the driver can support multiple. Mesa allows -- * selection using an environment variable though so that's what -- * we're doing here... */ -- g_setenv ("EGL_PLATFORM", "wayland", 1); -- - if (renderer->foreign_wayland_display) - { - wayland_renderer->wayland_display = renderer->foreign_wayland_display; diff --git a/desktop/gnome/base/cogl/pspec.xml b/desktop/gnome/base/cogl/pspec.xml deleted file mode 100644 index 01bd2c16b9..0000000000 --- a/desktop/gnome/base/cogl/pspec.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - cogl - http://developer.gnome.org/cogl - - Pisi Linux Admins - admin@pisilinux.org - - LGPLv2.1 - library - A low level OpenGL abstraction library - Cogl is a low level OpenGL abstraction library developed for (and part of) Clutter. - mirrors://gnome/cogl/1.20/cogl-1.20.0.tar.xz - - mesa-devel - libdrm-devel - pango-devel - libXext-devel - libXrandr-devel - libXdamage-devel - libXcomposite-devel - gdk-pixbuf-devel - gobject-introspection-devel - - - - - cogl - - mesa - cairo - pango - libXext - libXfixes - libXrandr - gdk-pixbuf - libXdamage - - - /usr/bin - /usr/lib - /usr/share/locale - /usr/share/man - /usr/share/doc - /usr/share - - - - - cogl-devel - - mesa-devel - cairo-devel - libXext-devel - libXfixes-devel - libXrandr-devel - gdk-pixbuf-devel - libXdamage-devel - libXcomposite-devel - cogl - - - /usr/include - /usr/lib/pkgconfig - - - - - - 2015-04-18 - 1.20.0 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-06-14 - 1.18.0 - Version bump. - Alihan Öztürk - alihan@pisilinux.org - - - 2013-10-11 - 1.16.0 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-07-31 - 1.14.0 - Rebuild, fix deps. - Marcin Bojara - marcin@pisilinux.org - - - 2013-06-15 - 1.14.0 - Rebuild with new configure args - Marcin Bojara - marcin@pisilinux.org - - - 2013-05-11 - 1.14.0 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-04-23 - 1.12.0 - Dep fixed - Osman Erkan - osman.erkan@pisilinux.org - - - 2012-10-24 - 1.12.0 - First release - Pisi Linux Admins - admin@pisilinux.org - - - diff --git a/desktop/gnome/base/cogl/translations.xml b/desktop/gnome/base/cogl/translations.xml deleted file mode 100644 index 14c514621e..0000000000 --- a/desktop/gnome/base/cogl/translations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - cogl - A low level OpenGL abstraction library - Cogl is a low level OpenGL abstraction library developed for (and part of) Clutter. - - - - cogl-devel - cogl için geliştirme dosyaları. - - diff --git a/desktop/gnome2/orbit2/actions.py b/desktop/gnome2/orbit2/actions.py deleted file mode 100644 index e2333e0cee..0000000000 --- a/desktop/gnome2/orbit2/actions.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 - -WorkDir = "ORBit2-%s" % get.srcVERSION() - -def setup(): - autotools.configure("--disable-static") - pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") - -def build(): - autotools.make("-j1") - -def install(): - autotools.install() - - pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING*", "NEWS", "README", "TODO") diff --git a/desktop/gnome2/orbit2/files/fedora/ORBit2-allow-deprecated.patch b/desktop/gnome2/orbit2/files/fedora/ORBit2-allow-deprecated.patch deleted file mode 100644 index 25215f6ad5..0000000000 --- a/desktop/gnome2/orbit2/files/fedora/ORBit2-allow-deprecated.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ORBit2-2.14.19/linc2/src/Makefile.am.depr 2013-03-15 09:24:45.384143557 -0400 -+++ ORBit2-2.14.19/linc2/src/Makefile.am 2013-03-15 09:24:55.172144088 -0400 -@@ -12,8 +12,7 @@ - -I$(top_builddir)/linc2/include \ - -I$(top_srcdir)/linc2/include \ - $(LINC_CFLAGS) \ -- $(WARN_CFLAGS) \ -- -DG_DISABLE_DEPRECATED -+ $(WARN_CFLAGS) - - if OS_WIN32 - else ---- ORBit2-2.14.19/linc2/src/Makefile.in.depr 2013-03-15 09:24:45.943143588 -0400 -+++ ORBit2-2.14.19/linc2/src/Makefile.in 2013-03-15 09:25:08.333144801 -0400 -@@ -244,7 +244,7 @@ - # -I$(top_srcdir)/include - INCLUDES = -I$(top_builddir)/linc2/include \ - -I$(top_srcdir)/linc2/include $(LINC_CFLAGS) $(WARN_CFLAGS) \ -- -DG_DISABLE_DEPRECATED $(am__append_1) -+ $(am__append_1) - liblinc_la_SOURCES = \ - linc.c \ - linc-connection.c \ diff --git a/desktop/gnome2/orbit2/pspec.xml b/desktop/gnome2/orbit2/pspec.xml deleted file mode 100644 index 06bd480464..0000000000 --- a/desktop/gnome2/orbit2/pspec.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - orbit2 - http://www.gnome.org/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - LGPLv2 - library - High-performance CORBA ORB - Orbit2 allows to communication between two programs objects. - mirrors://gnome/ORBit2/2.14/ORBit2-2.14.19.tar.bz2 - - libIDL-devel - glib2-devel - - - fedora/ORBit2-allow-deprecated.patch - - - - - orbit2 - - libIDL - glib2 - - - /usr/bin - /usr/lib - /usr/share/doc - /usr/share/idl - - - - - orbit2-devel - Development files for orbit2 - - orbit2 - libIDL-devel - glib2-devel - - - /usr/bin/orbit2-config - /usr/include - /usr/lib/*.a - /usr/lib/pkgconfig - /usr/share/aclocal - - - - - orbit2-docs - data:doc - ORBit2 reference documents - - /usr/share/gtk-doc - - - - - - 2014-05-21 - 2.14.19 - Rebuild. - Kamil Atlı - suvarice@gmail.com - - - 2013-10-29 - 2.14.19 - Rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-08-26 - 2.14.19 - Release bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2010-12-22 - 2.14.19 - First release - PisiLinux Community - admins@pisilinux.org - - - diff --git a/desktop/gnome2/orbit2/translations.xml b/desktop/gnome2/orbit2/translations.xml deleted file mode 100644 index e60dc8361c..0000000000 --- a/desktop/gnome2/orbit2/translations.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - orbit2 - Yüksek performanslı CORBA ORB - Orbit2 iki program nesneleri arasındaki iletişimi sağlar. - - - - orbit2-docs - Orbit2 referans dökümanları - - - - orbit2-devel - orbit2 için geliştirme dosyaları - - diff --git a/desktop/toolkit/clutter/clutter/actions.py b/desktop/toolkit/clutter/clutter/actions.py deleted file mode 100644 index 3833a6c3f2..0000000000 --- a/desktop/toolkit/clutter/clutter/actions.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/copyleft/gpl.txt. - -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -def setup(): - autotools.autoreconf("-vif") - autotools.configure("--enable-egl-backend \ - --enable-evdev-input \ - --enable-introspection \ - --disable-static \ - --enable-shared ") - - pisitools.dosed("libtool"," -shared ", " -Wl,-O1,--as-needed -shared ") - -def build(): - autotools.make() - -def install(): - autotools.rawInstall('DESTDIR=%s INSTALL="install -p -c"' % get.installDIR()) - - pisitools.dodoc("ChangeLog*", "COPYING", "README*", "NEWS") - diff --git a/desktop/toolkit/clutter/clutter/files/closure-annotation.patch b/desktop/toolkit/clutter/clutter/files/closure-annotation.patch deleted file mode 100644 index 736287f92a..0000000000 --- a/desktop/toolkit/clutter/clutter/files/closure-annotation.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 084dc49a0cdadeed7de896df81e9af536f2ab678 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Thu, 2 Oct 2014 09:27:36 +0200 -Subject: x11: Add missing closure annotation to ClutterX11FilterFunc - - -diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h -index b0ab8a1..285ea51 100644 ---- a/clutter/x11/clutter-x11.h -+++ b/clutter/x11/clutter-x11.h -@@ -85,7 +85,7 @@ typedef struct _ClutterX11XInputDevice ClutterX11XInputDevice; - * ClutterX11FilterFunc: - * @xev: Native X11 event structure - * @cev: Clutter event structure -- * @data: user data passed to the filter function -+ * @data: (closure): user data passed to the filter function - * - * Filter function for X11 native events. - * --- -cgit v0.10.1 diff --git a/desktop/toolkit/clutter/clutter/files/clutter-1.18.2-libinput_fixes-1.patch b/desktop/toolkit/clutter/clutter/files/clutter-1.18.2-libinput_fixes-1.patch deleted file mode 100644 index cbca4819f8..0000000000 --- a/desktop/toolkit/clutter/clutter/files/clutter-1.18.2-libinput_fixes-1.patch +++ /dev/null @@ -1,196 +0,0 @@ -Submitted By: Armin K. -Date: 2014-07-22 -Initial Package Version: 1.18.2 -Upstream Status: Fixed -Origin: Upstream -Description: Fixes building with libinput-0.4.0 - ---- a/clutter/evdev/clutter-device-manager-evdev.c 2014-04-02 19:48:36.000000000 +0200 -+++ b/clutter/evdev/clutter-device-manager-evdev.c 2014-07-01 19:05:00.136732530 +0200 -@@ -375,8 +375,8 @@ - static void - notify_relative_motion (ClutterInputDevice *input_device, - guint32 time_, -- li_fixed_t dx, -- li_fixed_t dy) -+ double dx, -+ double dy) - { - gfloat new_x, new_y; - ClutterInputDeviceEvdev *device_evdev; -@@ -391,17 +391,9 @@ - device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device); - seat = _clutter_input_device_evdev_get_seat (device_evdev); - -- /* Append previously discarded fraction. */ -- dx += device_evdev->dx_frac; -- dy += device_evdev->dy_frac; -- - clutter_input_device_get_coords (seat->core_pointer, NULL, &point); -- new_x = point.x + li_fixed_to_int (dx); -- new_y = point.y + li_fixed_to_int (dy); -- -- /* Save the discarded fraction part for next motion event. */ -- device_evdev->dx_frac = (dx < 0 ? -1 : 1) * (0xff & dx); -- device_evdev->dy_frac = (dy < 0 ? -1 : 1) * (0xff & dy); -+ new_x = point.x + dx; -+ new_y = point.y + dy; - - notify_absolute_motion (input_device, time_, new_x, new_y); - } -@@ -988,7 +980,7 @@ - time = libinput_event_keyboard_get_time (key_event); - key = libinput_event_keyboard_get_key (key_event); - key_state = libinput_event_keyboard_get_key_state (key_event) == -- LIBINPUT_KEYBOARD_KEY_STATE_PRESSED; -+ LIBINPUT_KEY_STATE_PRESSED; - notify_key_device (device, time, key, key_state, TRUE); - - break; -@@ -997,7 +989,7 @@ - case LIBINPUT_EVENT_POINTER_MOTION: - { - guint32 time; -- li_fixed_t dx, dy; -+ double dx, dy; - struct libinput_event_pointer *motion_event = - libinput_event_get_pointer_event (event); - device = libinput_device_get_user_data (libinput_device); -@@ -1013,7 +1005,7 @@ - case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: - { - guint32 time; -- li_fixed_t x, y; -+ double x, y; - gfloat stage_width, stage_height; - ClutterStage *stage; - struct libinput_event_pointer *motion_event = -@@ -1032,10 +1024,7 @@ - stage_width); - y = libinput_event_pointer_get_absolute_y_transformed (motion_event, - stage_height); -- notify_absolute_motion (device, -- time, -- li_fixed_to_double(x), -- li_fixed_to_double(y)); -+ notify_absolute_motion (device, time, x, y); - - break; - } -@@ -1050,7 +1039,7 @@ - time = libinput_event_pointer_get_time (button_event); - button = libinput_event_pointer_get_button (button_event); - button_state = libinput_event_pointer_get_button_state (button_event) == -- LIBINPUT_POINTER_BUTTON_STATE_PRESSED; -+ LIBINPUT_BUTTON_STATE_PRESSED; - notify_button (device, time, button, button_state); - - break; -@@ -1066,18 +1055,17 @@ - device = libinput_device_get_user_data (libinput_device); - - time = libinput_event_pointer_get_time (axis_event); -- value = li_fixed_to_double ( -- libinput_event_pointer_get_axis_value (axis_event)); -+ value = libinput_event_pointer_get_axis_value (axis_event); - axis = libinput_event_pointer_get_axis (axis_event); - - switch (axis) - { -- case LIBINPUT_POINTER_AXIS_VERTICAL_SCROLL: -+ case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL: - dx = 0; - dy = value; - break; - -- case LIBINPUT_POINTER_AXIS_HORIZONTAL_SCROLL: -+ case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL: - dx = value; - dy = 0; - break; -@@ -1178,7 +1166,7 @@ - struct udev *udev; - - udev = udev_new (); -- if (!udev) -+ if (G_UNLIKELY (udev == NULL)) - { - g_warning ("Failed to create udev object"); - return; -@@ -1187,18 +1175,25 @@ - manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (gobject); - priv = manager_evdev->priv; - -- priv->libinput = libinput_udev_create_for_seat (&libinput_interface, -- manager_evdev, -- udev, -- "seat0"); -- udev_unref (udev); -+ priv->libinput = libinput_udev_create_context (&libinput_interface, -+ manager_evdev, -+ udev); -+ if (priv->libinput == NULL) -+ { -+ g_critical ("Failed to create the libinput object."); -+ return; -+ } - -- if (!priv->libinput) -+ if (libinput_udev_assign_seat (priv->libinput, "seat0") == -1) - { -- g_warning ("Failed to create libinput object"); -+ g_critical ("Failed to assign a seat to the libinput object."); -+ libinput_unref (priv->libinput); -+ priv->libinput = NULL; - return; - } - -+ udev_unref (udev); -+ - priv->main_seat = clutter_seat_evdev_new (manager_evdev); - - dispatch_libinput (manager_evdev); -@@ -1244,26 +1239,21 @@ - { - ClutterDeviceManagerEvdev *manager_evdev; - ClutterDeviceManagerEvdevPrivate *priv; -- GSList *l; - - manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (object); - priv = manager_evdev->priv; - -- for (l = priv->seats; l; l = g_slist_next (l)) -- { -- ClutterSeatEvdev *seat = l->data; -- -- clutter_seat_evdev_free (seat); -- } -- g_slist_free (priv->seats); -+ g_slist_free_full (priv->seats, (GDestroyNotify) clutter_seat_evdev_free); - g_slist_free (priv->devices); - -- clutter_event_source_free (priv->event_source); -+ if (priv->event_source != NULL) -+ clutter_event_source_free (priv->event_source); - -- if (priv->constrain_data_notify) -+ if (priv->constrain_data_notify != NULL) - priv->constrain_data_notify (priv->constrain_data); - -- libinput_destroy (priv->libinput); -+ if (priv->libinput != NULL) -+ libinput_unref (priv->libinput); - - G_OBJECT_CLASS (clutter_device_manager_evdev_parent_class)->finalize (object); - } ---- a/clutter/evdev/clutter-input-device-evdev.h 2014-04-02 19:48:36.000000000 +0200 -+++ b/clutter/evdev/clutter-input-device-evdev.h 2014-07-01 19:04:44.152439734 +0200 -@@ -64,8 +64,6 @@ - - struct libinput_device *libinput_device; - ClutterSeatEvdev *seat; -- li_fixed_t dx_frac; -- li_fixed_t dy_frac; - }; - - GType _clutter_input_device_evdev_get_type (void) G_GNUC_CONST; diff --git a/desktop/toolkit/clutter/clutter/files/create-pangocontext-per-actor.patch b/desktop/toolkit/clutter/clutter/files/create-pangocontext-per-actor.patch deleted file mode 100644 index 5dbbc2cbcd..0000000000 --- a/desktop/toolkit/clutter/clutter/files/create-pangocontext-per-actor.patch +++ /dev/null @@ -1,224 +0,0 @@ -From 46877cc2bd497ec23acfa07fedaf29f45522dc6f Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" -Date: Wed, 22 Oct 2014 18:44:22 -0700 -Subject: actor: Create a PangoContext per actor - -For a variety of complicated reasons, ClutterText currently sets fields -on the PangoContext when creating a layout. This causes ClutterText to -behave somewhat erratically in certain cases, since the PangoContext is -currently shared between all actors. - -GTK+ creates a PangoContext for every single GtkWidget, so it seems like -we should do the same here. - -Move the private code that was previously in clutter-main.c into -clutter-actor.c and clean it up a bit. This gives every actor its own -PangoContext it can mutilate whenever it wants, at its heart's content. - -https://bugzilla.gnome.org/show_bug.cgi?id=739050 - -diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c -index 6a0582a..33fe3e7 100644 ---- a/clutter/clutter-actor.c -+++ b/clutter/clutter-actor.c -@@ -15474,6 +15474,46 @@ clutter_actor_grab_key_focus (ClutterActor *self) - clutter_stage_set_key_focus (CLUTTER_STAGE (stage), self); - } - -+static void -+update_pango_context (ClutterBackend *backend, -+ PangoContext *context) -+{ -+ ClutterSettings *settings; -+ PangoFontDescription *font_desc; -+ const cairo_font_options_t *font_options; -+ gchar *font_name; -+ PangoDirection pango_dir; -+ gdouble resolution; -+ -+ settings = clutter_settings_get_default (); -+ -+ /* update the text direction */ -+ if (clutter_get_default_text_direction () == CLUTTER_TEXT_DIRECTION_RTL) -+ pango_dir = PANGO_DIRECTION_RTL; -+ else -+ pango_dir = PANGO_DIRECTION_LTR; -+ -+ pango_context_set_base_dir (context, pango_dir); -+ -+ g_object_get (settings, "font-name", &font_name, NULL); -+ -+ /* get the configuration for the PangoContext from the backend */ -+ font_options = clutter_backend_get_font_options (backend); -+ resolution = clutter_backend_get_resolution (backend); -+ -+ font_desc = pango_font_description_from_string (font_name); -+ -+ if (resolution < 0) -+ resolution = 96.0; /* fall back */ -+ -+ pango_context_set_font_description (context, font_desc); -+ pango_cairo_context_set_font_options (context, font_options); -+ pango_cairo_context_set_resolution (context, resolution); -+ -+ pango_font_description_free (font_desc); -+ g_free (font_name); -+} -+ - /** - * clutter_actor_get_pango_context: - * @self: a #ClutterActor -@@ -15500,16 +15540,23 @@ PangoContext * - clutter_actor_get_pango_context (ClutterActor *self) - { - ClutterActorPrivate *priv; -+ ClutterBackend *backend = clutter_get_default_backend (); - - g_return_val_if_fail (CLUTTER_IS_ACTOR (self), NULL); - - priv = self->priv; - -- if (priv->pango_context != NULL) -- return priv->pango_context; -+ if (G_UNLIKELY (priv->pango_context == NULL)) -+ { -+ priv->pango_context = clutter_actor_create_pango_context (self); - -- priv->pango_context = _clutter_context_get_pango_context (); -- g_object_ref (priv->pango_context); -+ g_signal_connect_object (backend, "resolution-changed", -+ G_CALLBACK (update_pango_context), priv->pango_context, 0); -+ g_signal_connect_object (backend, "font-changed", -+ G_CALLBACK (update_pango_context), priv->pango_context, 0); -+ } -+ else -+ update_pango_context (backend, priv->pango_context); - - return priv->pango_context; - } -@@ -15533,9 +15580,16 @@ clutter_actor_get_pango_context (ClutterActor *self) - PangoContext * - clutter_actor_create_pango_context (ClutterActor *self) - { -- g_return_val_if_fail (CLUTTER_IS_ACTOR (self), NULL); -+ CoglPangoFontMap *font_map; -+ PangoContext *context; -+ -+ font_map = COGL_PANGO_FONT_MAP (clutter_get_font_map ()); -+ -+ context = cogl_pango_font_map_create_context (font_map); -+ update_pango_context (clutter_get_default_backend (), context); -+ pango_context_set_language (context, pango_language_get_default ()); - -- return _clutter_context_create_pango_context (); -+ return context; - } - - /** -diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c -index 3b9385a..1a337c0 100644 ---- a/clutter/clutter-main.c -+++ b/clutter/clutter-main.c -@@ -764,86 +764,6 @@ clutter_get_text_direction (void) - return dir; - } - --static void --update_pango_context (ClutterBackend *backend, -- PangoContext *context) --{ -- ClutterSettings *settings; -- PangoFontDescription *font_desc; -- const cairo_font_options_t *font_options; -- gchar *font_name; -- PangoDirection pango_dir; -- gdouble resolution; -- -- settings = clutter_settings_get_default (); -- -- /* update the text direction */ -- if (clutter_text_direction == CLUTTER_TEXT_DIRECTION_RTL) -- pango_dir = PANGO_DIRECTION_RTL; -- else -- pango_dir = PANGO_DIRECTION_LTR; -- -- pango_context_set_base_dir (context, pango_dir); -- -- g_object_get (settings, "font-name", &font_name, NULL); -- -- /* get the configuration for the PangoContext from the backend */ -- font_options = clutter_backend_get_font_options (backend); -- resolution = clutter_backend_get_resolution (backend); -- -- font_desc = pango_font_description_from_string (font_name); -- -- if (resolution < 0) -- resolution = 96.0; /* fall back */ -- -- pango_context_set_font_description (context, font_desc); -- pango_cairo_context_set_font_options (context, font_options); -- pango_cairo_context_set_resolution (context, resolution); -- -- pango_font_description_free (font_desc); -- g_free (font_name); --} -- --PangoContext * --_clutter_context_get_pango_context (void) --{ -- ClutterMainContext *self = _clutter_context_get_default (); -- -- if (G_UNLIKELY (self->pango_context == NULL)) -- { -- PangoContext *context; -- -- context = _clutter_context_create_pango_context (); -- self->pango_context = context; -- -- g_signal_connect (self->backend, "resolution-changed", -- G_CALLBACK (update_pango_context), -- self->pango_context); -- g_signal_connect (self->backend, "font-changed", -- G_CALLBACK (update_pango_context), -- self->pango_context); -- } -- else -- update_pango_context (self->backend, self->pango_context); -- -- return self->pango_context; --} -- --PangoContext * --_clutter_context_create_pango_context (void) --{ -- CoglPangoFontMap *font_map; -- PangoContext *context; -- -- font_map = clutter_context_get_pango_fontmap (); -- -- context = cogl_pango_font_map_create_context (font_map); -- update_pango_context (clutter_get_default_backend (), context); -- pango_context_set_language (context, pango_language_get_default ()); -- -- return context; --} -- - /** - * clutter_main_quit: - * -diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h -index bf92626..b714edc 100644 ---- a/clutter/clutter-private.h -+++ b/clutter/clutter-private.h -@@ -198,8 +198,6 @@ ClutterMainContext * _clutter_context_get_default (void); - void _clutter_context_lock (void); - void _clutter_context_unlock (void); - gboolean _clutter_context_is_initialized (void); --PangoContext * _clutter_context_create_pango_context (void); --PangoContext * _clutter_context_get_pango_context (void); - ClutterPickMode _clutter_context_get_pick_mode (void); - void _clutter_context_push_shader_stack (ClutterActor *actor); - ClutterActor * _clutter_context_pop_shader_stack (ClutterActor *actor); --- -cgit v0.10.1 - diff --git a/desktop/toolkit/clutter/clutter/files/dont-update-pangocontext.patch b/desktop/toolkit/clutter/clutter/files/dont-update-pangocontext.patch deleted file mode 100644 index 2fa149504e..0000000000 --- a/desktop/toolkit/clutter/clutter/files/dont-update-pangocontext.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 14d28e7908d5421f15f9b94f4f37d66f14c4222e Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" -Date: Wed, 22 Oct 2014 18:44:16 -0700 -Subject: main: Don't update the PangoContext in clutter_set_font_flags - -clutter_set_font_flags already calls clutter_backend_set_font_options, -which emits a signal which our PangoContext listens to, so this is just -duplicate and unneeded code. - -https://bugzilla.gnome.org/show_bug.cgi?id=739050 - -diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c -index 444ceba..3b9385a 100644 ---- a/clutter/clutter-main.c -+++ b/clutter/clutter-main.c -@@ -3276,7 +3276,6 @@ clutter_clear_glyph_cache (void) - void - clutter_set_font_flags (ClutterFontFlags flags) - { -- ClutterMainContext *context = _clutter_context_get_default (); - CoglPangoFontMap *font_map; - ClutterFontFlags old_flags, changed_flags; - const cairo_font_options_t *font_options; -@@ -3326,10 +3325,6 @@ clutter_set_font_flags (ClutterFontFlags flags) - clutter_backend_set_font_options (backend, new_font_options); - - cairo_font_options_destroy (new_font_options); -- -- /* update the default pango context, if any */ -- if (context->pango_context != NULL) -- update_pango_context (backend, context->pango_context); - } - - /** --- -cgit v0.10.1 - diff --git a/desktop/toolkit/clutter/clutter/files/evdev-flush-event-queue.patch b/desktop/toolkit/clutter/clutter/files/evdev-flush-event-queue.patch deleted file mode 100644 index 0eb9e1632e..0000000000 --- a/desktop/toolkit/clutter/clutter/files/evdev-flush-event-queue.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7764fd2079318fede95b4b96c72d18bd31699270 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Tue, 14 Oct 2014 12:41:10 +0200 -Subject: evdev: Flush event queue before removing an input device - -libinput_suspend() will trigger the removal of input devices, but also -the emission of button/key releases pairing everything that is pressed -at that moment. These events are queued, but the ClutterInputDevice -pointers in these will point to invalid memory at the time these are -processed. - -Fix this by flushing the event queue, in order to ensure there are no -unprocessed input events after libinput_suspend(). - -https://bugzilla.gnome.org/show_bug.cgi?id=738520 - -diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c -index 77a8ec6..7b48481 100644 ---- a/clutter/evdev/clutter-device-manager-evdev.c -+++ b/clutter/evdev/clutter-device-manager-evdev.c -@@ -1017,6 +1017,18 @@ clutter_seat_evdev_sync_leds (ClutterSeatEvdev *seat) - } - } - -+static void -+flush_event_queue (void) -+{ -+ ClutterEvent *event; -+ -+ while ((event = clutter_event_get ()) != NULL) -+ { -+ _clutter_process_event (event); -+ clutter_event_free (event); -+ } -+} -+ - static gboolean - process_base_event (ClutterDeviceManagerEvdev *manager_evdev, - struct libinput_event *event) -@@ -1034,6 +1046,11 @@ process_base_event (ClutterDeviceManagerEvdev *manager_evdev, - break; - - case LIBINPUT_EVENT_DEVICE_REMOVED: -+ /* Flush all queued events, there -+ * might be some from this device. -+ */ -+ flush_event_queue (); -+ - libinput_device = libinput_event_get_device (event); - - device = libinput_device_get_user_data (libinput_device); --- -cgit v0.10.1 - diff --git a/desktop/toolkit/clutter/clutter/files/libinput08.patch b/desktop/toolkit/clutter/clutter/files/libinput08.patch deleted file mode 100644 index 89a7364e66..0000000000 --- a/desktop/toolkit/clutter/clutter/files/libinput08.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ede13b11d72a310e535f9a6f0b7e3f774f5529dc Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 16 Jan 2015 01:03:52 +0100 -Subject: evdev: use libinput's new merged scroll events - -libinput's API changed from separate scroll events for vert/horiz scrolling to -a single event that contains both axes if they changed. - -Updated by Armin K. to use the discrete axis value for wheel events as done -in Weston. - -https://bugzilla.gnome.org/show_bug.cgi?id=742829 - -diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c -index 7b48481..2b3828a 100644 ---- a/clutter/evdev/clutter-device-manager-evdev.c -+++ b/clutter/evdev/clutter-device-manager-evdev.c -@@ -1191,29 +1191,43 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev, - - case LIBINPUT_EVENT_POINTER_AXIS: - { -- gdouble value, dx = 0.0, dy = 0.0; -+ gdouble dx = 0.0, dy = 0.0; - guint32 time; -+ gboolean wheel = FALSE; - enum libinput_pointer_axis axis; -+ enum libinput_pointer_axis_source source; - struct libinput_event_pointer *axis_event = - libinput_event_get_pointer_event (event); -+ - device = libinput_device_get_user_data (libinput_device); - - time = libinput_event_pointer_get_time (axis_event); -- value = libinput_event_pointer_get_axis_value (axis_event); -- axis = libinput_event_pointer_get_axis (axis_event); -+ source = libinput_event_pointer_get_axis_source (axis_event); - -- switch (axis) -- { -- case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL: -- dx = 0; -- dy = value; -- break; -+ /* libinput < 0.8 sent wheel click events with value 10. Since 0.8 -+ the value is the angle of the click in degrees. To keep -+ backwards-compat with existing clients, we just send multiples of -+ the click count. */ -+ -+ if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL) -+ wheel = TRUE; - -- case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL: -- dx = value; -- dy = 0; -- break; -+ axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL; -+ if (libinput_event_pointer_has_axis (axis_event, axis)) -+ { -+ if (wheel) -+ dy = 10 * libinput_event_pointer_get_axis_value_discrete (axis_event, axis); -+ else -+ dy = libinput_event_pointer_get_axis_value (axis_event, axis); -+ } - -+ axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL; -+ if (libinput_event_pointer_has_axis (axis_event, axis)) -+ { -+ if (wheel) -+ dx = 10 * libinput_event_pointer_get_axis_value_discrete (axis_event, axis); -+ else -+ dx = libinput_event_pointer_get_axis_value (axis_event, axis); - } - - notify_scroll (device, time, dx, dy); -diff --git a/configure.ac b/configure.ac -index 0a9a580..2a47744 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,7 +146,7 @@ m4_define([uprof_req_version], [0.3]) - m4_define([gtk_doc_req_version], [1.20]) - m4_define([xcomposite_req_version], [0.4]) - m4_define([gdk_req_version], [3.3.18]) --m4_define([libinput_req_version], [0.4.0]) -+m4_define([libinput_req_version], [0.8.0]) - m4_define([libudev_req_version], [136]) - - AC_SUBST([GLIB_REQ_VERSION], [glib_req_version]) --- -cgit v0.10.1 diff --git a/desktop/toolkit/clutter/clutter/pspec.xml b/desktop/toolkit/clutter/clutter/pspec.xml deleted file mode 100644 index b60da4b1ca..0000000000 --- a/desktop/toolkit/clutter/clutter/pspec.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - clutter - http://www.clutter-project.org/ - - Pisi Linux Admins - admins@pisilinux.org - - LGPLv2.1 - library - OpenGL GUI toolkit - clutter is an open source software library for creating fast, visually rich graphical user interfaces. The most obvious example of potential usage is in media center type applications. - mirrors://gnome/clutter/1.22/clutter-1.22.4.tar.xz - - gtk3-devel - libXi-devel - libinput-devel - cogl-devel - gobject-introspection-devel - - - - - clutter - - atk - cogl - gtk3 - cairo - libXi - pango - libinput - json-glib - fontconfig - libXdamage - libxkbcommon - libXcomposite - - - /usr/lib/girepository-1.0 - /usr/lib/libclutter* - /usr/share/doc/clutter - /usr/share/gtk-doc - /usr/share/gir-1.0 - /usr/share/locale/ - - - - - clutter-devel - clutter için geliştirme dosyaları. - - clutter - atk-devel - gtk3-devel - cogl-devel - pango-devel - libXi-devel - cairo-devel - libXext-devel - json-glib-devel - libXdamage-devel - libXcomposite-devel - libinput-devel - libxkbcommon-devel - - - /usr/include - /usr/lib/pkgconfig - - - - - - 2015-07-21 - 1.22.4 - Version bump. - Ayhan Yalçınsoy - ayhanyalcinsoy@pisilinux.org - - - 2015-04-18 - 1.22.0 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2015-02-16 - 1.20.0 - Version bump. - Hakan Yıldız - hknyldz93@gmail.com - - - 2014-10-26 - 1.18.2 - rebuild for patch - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-27 - 1.18.2 - Verison bump. - Alihan Öztürk - alihan@pisilinux.org - - - 2013-10-22 - 1.16.0 - Unused fix. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-10-11 - 1.16.0 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-07-23 - 1.14.4 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-06-16 - 1.14.2 - Split package - PisiLinux Community - admins@pisilinux.org - - - 2013-06-15 - 1.14.2 - Rebuild with new configure args - Marcin Bojara - marcin@pisilinux.org - - - 2013-05-11 - 1.14.2 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-01-25 - 1.13.4 - Güncellendi. - PisiLinux Community - admins@pisilinux.org - - - 2012-12-17 - 1.12.2 - First release - PisiLinux Community - admins@pisilinux.org - - - diff --git a/desktop/toolkit/clutter/clutter/translations.xml b/desktop/toolkit/clutter/clutter/translations.xml deleted file mode 100644 index 9daa14f6ed..0000000000 --- a/desktop/toolkit/clutter/clutter/translations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - clutter - OpenGL grafik arabirim kitaplığı - clutter görsel olarak zengin ve hızlı grafik arabirimler oluşturmak için hazırlanmış bir açık kodlu kitaplıktır. Kullanım alanlarına en belirgin örnek olarak çoklu ortam yazılımları gösterilebilir. - - - - clutter-devel - clutter için geliştirme dosyaları. - - \ No newline at end of file diff --git a/desktop/toolkit/clutter/component.xml b/desktop/toolkit/clutter/component.xml deleted file mode 100644 index d8ffb39888..0000000000 --- a/desktop/toolkit/clutter/component.xml +++ /dev/null @@ -1,3 +0,0 @@ - - desktop.toolkit.clutter -