diff --git a/desktop/gnome/base/cogl/actions.py b/desktop/gnome/base/cogl/actions.py new file mode 100644 index 0000000000..0d0037a76f --- /dev/null +++ b/desktop/gnome/base/cogl/actions.py @@ -0,0 +1,36 @@ +#!/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 new file mode 100644 index 0000000000..bb0178fbb6 --- /dev/null +++ b/desktop/gnome/base/cogl/files/git-fixes.patch @@ -0,0 +1,1242 @@ +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 new file mode 100644 index 0000000000..01bd2c16b9 --- /dev/null +++ b/desktop/gnome/base/cogl/pspec.xml @@ -0,0 +1,128 @@ + + + + + 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 new file mode 100644 index 0000000000..14c514621e --- /dev/null +++ b/desktop/gnome/base/cogl/translations.xml @@ -0,0 +1,13 @@ + + + + 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/component.xml b/desktop/gnome2/component.xml new file mode 100644 index 0000000000..2fc2b49e11 --- /dev/null +++ b/desktop/gnome2/component.xml @@ -0,0 +1,3 @@ + + desktop.gnome2 + diff --git a/desktop/gnome2/glibmm/actions.py b/desktop/gnome2/glibmm/actions.py new file mode 100644 index 0000000000..eb4364dc46 --- /dev/null +++ b/desktop/gnome2/glibmm/actions.py @@ -0,0 +1,26 @@ +#!/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 + +def setup(): + autotools.configure("--disable-static") + + pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.install() + + dirs = ["/usr/share/doc", "/usr/share/devhelp"] + for dir in dirs: + pisitools.removeDir(dir) + + pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README") diff --git a/desktop/gnome2/glibmm/pspec.xml b/desktop/gnome2/glibmm/pspec.xml new file mode 100644 index 0000000000..904fbff692 --- /dev/null +++ b/desktop/gnome2/glibmm/pspec.xml @@ -0,0 +1,98 @@ + + + + + glibmm + http://gtkmm.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + C++ interface for glib2 + Glibmm is the official C++ interface for the popular GUI library GTK+. Highlights include typesafe callbacks and a comprehensive set of widgets that are easily extensible via inheritance. + mirrors://gnome/glibmm/2.44/glibmm-2.44.0.tar.xz + + libsigc++-devel + glib2-devel + pkgconfig + + + + + glibmm + + glib2 + libgcc + libsigc++ + + + /usr/lib + /usr/share/doc + + + + + glibmm-devel + Development files for glibmm + + glibmm + glib2-devel + libsigc++-devel + + + /usr/include + /usr/lib/glibmm-* + /usr/lib/giomm-* + /usr/lib/pkgconfig + /usr/share/aclocal + /usr/share/glibmm-* + + + + + + 2015-07-21 + 2.44.0 + Version bump + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-05-18 + 2.40.0 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-12-23 + 2.38.0 + Version bump + Burak Fazıl Ertürk + burakerturk@pisilinux.org + + + 2013-10-29 + 2.36.2 + Rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-14 + 2.36.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-22 + 2.34.1 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/desktop/gnome2/glibmm/translations.xml b/desktop/gnome2/glibmm/translations.xml new file mode 100644 index 0000000000..995e98bd68 --- /dev/null +++ b/desktop/gnome2/glibmm/translations.xml @@ -0,0 +1,14 @@ + + + + glibmm + glib2 kitaplığı için C++ programlama dili arayüzü + Glibmm, ünlü GUI kitaplığı GTK+ için resmi C++ arayüzüdür. Önemli özelliklerinin arasında tip bağımsız çağırmalar ve miras ile genişleyebilen uyumlu parçacıklar vardır. + Glibmm est l'interface officielle C++ pour la librairie IHM populaire GTK+. Au menu des callbacks (rappels) typesafe (avec vérification de type à la compilation) ainsi qu'un ensemble large et complet de widgets (objets graphiques) facilement extensible via héritage. + + + + glibmm-devel + glibmm için geliştirme dosyaları + + diff --git a/desktop/gnome2/orbit2/actions.py b/desktop/gnome2/orbit2/actions.py new file mode 100644 index 0000000000..e2333e0cee --- /dev/null +++ b/desktop/gnome2/orbit2/actions.py @@ -0,0 +1,23 @@ +#!/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 new file mode 100644 index 0000000000..25215f6ad5 --- /dev/null +++ b/desktop/gnome2/orbit2/files/fedora/ORBit2-allow-deprecated.patch @@ -0,0 +1,23 @@ +--- 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 new file mode 100644 index 0000000000..06bd480464 --- /dev/null +++ b/desktop/gnome2/orbit2/pspec.xml @@ -0,0 +1,96 @@ + + + + + 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 new file mode 100644 index 0000000000..e60dc8361c --- /dev/null +++ b/desktop/gnome2/orbit2/translations.xml @@ -0,0 +1,18 @@ + + + + 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 new file mode 100644 index 0000000000..3833a6c3f2 --- /dev/null +++ b/desktop/toolkit/clutter/clutter/actions.py @@ -0,0 +1,28 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/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 new file mode 100644 index 0000000000..736287f92a --- /dev/null +++ b/desktop/toolkit/clutter/clutter/files/closure-annotation.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 0000000000..cbca4819f8 --- /dev/null +++ b/desktop/toolkit/clutter/clutter/files/clutter-1.18.2-libinput_fixes-1.patch @@ -0,0 +1,196 @@ +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 new file mode 100644 index 0000000000..5dbbc2cbcd --- /dev/null +++ b/desktop/toolkit/clutter/clutter/files/create-pangocontext-per-actor.patch @@ -0,0 +1,224 @@ +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 new file mode 100644 index 0000000000..2fa149504e --- /dev/null +++ b/desktop/toolkit/clutter/clutter/files/dont-update-pangocontext.patch @@ -0,0 +1,37 @@ +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 new file mode 100644 index 0000000000..0eb9e1632e --- /dev/null +++ b/desktop/toolkit/clutter/clutter/files/evdev-flush-event-queue.patch @@ -0,0 +1,54 @@ +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 new file mode 100644 index 0000000000..89a7364e66 --- /dev/null +++ b/desktop/toolkit/clutter/clutter/files/libinput08.patch @@ -0,0 +1,89 @@ +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 new file mode 100644 index 0000000000..b60da4b1ca --- /dev/null +++ b/desktop/toolkit/clutter/clutter/pspec.xml @@ -0,0 +1,168 @@ + + + + + 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 new file mode 100644 index 0000000000..9daa14f6ed --- /dev/null +++ b/desktop/toolkit/clutter/clutter/translations.xml @@ -0,0 +1,13 @@ + + + + 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 new file mode 100644 index 0000000000..d8ffb39888 --- /dev/null +++ b/desktop/toolkit/clutter/component.xml @@ -0,0 +1,3 @@ + + desktop.toolkit.clutter + diff --git a/hardware/optical/cdparanoia/actions.py b/hardware/optical/cdparanoia/actions.py new file mode 100644 index 0000000000..b782881293 --- /dev/null +++ b/hardware/optical/cdparanoia/actions.py @@ -0,0 +1,36 @@ +#!/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 libtools +from pisi.actionsapi import shelltools +from pisi.actionsapi import get + +WorkDir = "cdparanoia-III-10.2" +flags = "%s -I%s/%s/interface -Wno-pointer-sign -Wno-unused -Werror-implicit-function-declaration" % (get.CFLAGS(), get.workDIR(), WorkDir) + +def setup(): + #shelltools.cd("cdparanoia-III-10.2") + #shelltools.move("configure.guess", "config.guess") + #shelltools.move("configure.sub", "config.sub") + + autotools.autoreconf("-vfi") + libtools.gnuconfig_update() + libtools.libtoolize("--force --install") + autotools.configure() + +def build(): + autotools.make('OPT="%s" -j1' % flags) + + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # No static libs + #pisitools.remove("/usr/lib/*.a") + + pisitools.dodoc("COPYING*", "README") diff --git a/hardware/optical/cdparanoia/files/build_system.patch b/hardware/optical/cdparanoia/files/build_system.patch new file mode 100644 index 0000000000..4bae2389c1 --- /dev/null +++ b/hardware/optical/cdparanoia/files/build_system.patch @@ -0,0 +1,158 @@ +Fix build system to be usable by compiling shared libs as -fPIC and +using DESTDIR for installing. Patch by Samuli Suominen and Alexis Ballier . See, + +http://trac.xiph.org/ticket/1368 (upstream bug) + +diff -ur cdparanoia-III-10.2.orig/interface/Makefile.in cdparanoia-III-10.2/interface/Makefile.in +--- cdparanoia-III-10.2.orig/interface/Makefile.in 2008-08-21 19:08:54.000000000 +0300 ++++ cdparanoia-III-10.2/interface/Makefile.in 2009-06-20 20:43:39.000000000 +0300 +@@ -10,6 +10,7 @@ + FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@ + OPT=@OPT@ $(FLAGS) + DEBUG=@DEBUG@ -DCDDA_TEST ++LIBFLAGS = -fPIC + CC=@CC@ + LD=@CC@ + LDFLAGS=@LDFLAGS@ $(FLAGS) +@@ -20,6 +21,8 @@ + + OFILES = scan_devices.o common_interface.o cooked_interface.o interface.o\ + scsi_interface.o smallft.o toc.o test_interface.o ++LOFILES = scan_devices.lo common_interface.lo cooked_interface.lo interface.lo\ ++ scsi_interface.lo smallft.lo toc.lo test_interface.lo + + export VERSION + +@@ -32,8 +35,7 @@ + $(MAKE) libcdda_interface.a CFLAGS="$(OPT)" + + slib: +- $(MAKE) lessmessy +- $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" ++ $(MAKE) libcdda_interface.so CFLAGS="$(OPT)" + [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0 + + test: +@@ -45,14 +47,17 @@ + $(AR) -r libcdda_interface.a $(OFILES) + $(RANLIB) libcdda_interface.a + +-libcdda_interface.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) ++libcdda_interface.so: $(LOFILES) ++ $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LOFILES) $(LIBS) + [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 + [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so + + .c.o: + $(CC) $(CFLAGS) -c $< + ++%.lo: %.c ++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@ ++ + lessmessy: + -rm -f *.o core *~ *.out + +diff -ur cdparanoia-III-10.2.orig/Makefile.in cdparanoia-III-10.2/Makefile.in +--- cdparanoia-III-10.2.orig/Makefile.in 2008-09-11 23:33:30.000000000 +0300 ++++ cdparanoia-III-10.2/Makefile.in 2009-06-20 20:43:17.000000000 +0300 +@@ -63,28 +63,28 @@ + cd paranoia && $(MAKE) slib + + install: +- $(INSTALL) -d -m 0755 $(BINDIR) +- $(INSTALL) -m 755 $(srcdir)/cdparanoia $(BINDIR) +- $(INSTALL) -d -m 0755 $(MANDIR) +- $(INSTALL) -d -m 0755 $(MANDIR)/man1 +- $(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1 +- $(INSTALL) -d -m 0755 $(INCLUDEDIR) +- $(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR) +- $(INSTALL) -d -m 0755 $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR) +- $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR) +- $(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man1 ++ $(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1 ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR) + ln -fs libcdda_interface.so.0.$(VERSION) \ +- $(LIBDIR)/libcdda_interface.so.0 ++ $(DESTDIR)$(LIBDIR)/libcdda_interface.so.0 + ln -fs libcdda_interface.so.0.$(VERSION) \ +- $(LIBDIR)/libcdda_interface.so ++ $(DESTDIR)$(LIBDIR)/libcdda_interface.so + ln -fs libcdda_paranoia.so.0.$(VERSION) \ +- $(LIBDIR)/libcdda_paranoia.so.0 ++ $(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0 + ln -fs libcdda_paranoia.so.0.$(VERSION) \ +- $(LIBDIR)/libcdda_paranoia.so ++ $(DESTDIR)$(LIBDIR)/libcdda_paranoia.so + + cdparanoia: $(OFILES) $(LIBDEP) + $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \ +diff -ur cdparanoia-III-10.2.orig/paranoia/Makefile.in cdparanoia-III-10.2/paranoia/Makefile.in +--- cdparanoia-III-10.2.orig/paranoia/Makefile.in 2008-09-04 22:02:47.000000000 +0300 ++++ cdparanoia-III-10.2/paranoia/Makefile.in 2009-06-20 20:43:39.000000000 +0300 +@@ -11,6 +11,7 @@ + FLAGS=@TYPESIZES@ @CFLAGS@ + OPT=@OPT@ $(FLAGS) + DEBUG=@DEBUG@ ++LIBFLAGS = -fPIC + CC=@CC@ + LD=@CC@ + LDFLAGS=@LDFLAGS@ $(FLAGS) +@@ -20,8 +21,9 @@ + + OFILES = paranoia.o p_block.o overlap.o gap.o isort.o + #TFILES = isort.t gap.t p_block.t paranoia.t ++LOFILES = paranoia.lo p_block.lo overlap.lo gap.lo isort.lo + +-LIBS = ../interface/libcdda_interface.a -lm ++LIBS = ../interface/libcdda_interface.so -lm + export VERSION + + all: lib slib +@@ -33,8 +35,7 @@ + $(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" + + slib: +- $(MAKE) lessmessy +- $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" ++ $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)" + + #test: $(TFILES) + # +@@ -43,14 +44,17 @@ + $(AR) -r libcdda_paranoia.a $(OFILES) + $(RANLIB) libcdda_paranoia.a + +-libcdda_paranoia.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface ++libcdda_paranoia.so: $(LOFILES) ++ $(CC) $(LDFLAGS) $(LIBSFLAGS) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LOFILES) -L ../interface -lcdda_interface + [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 + [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so + + .c.o: + $(CC) $(CFLAGS) -c $< + ++%.lo: %.c ++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@ ++ + .c.t: + $(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS) + $@ diff --git a/hardware/optical/cdparanoia/files/cdparanoia-III-05-gcc4.3.patch b/hardware/optical/cdparanoia/files/cdparanoia-III-05-gcc4.3.patch new file mode 100644 index 0000000000..a570775b4b --- /dev/null +++ b/hardware/optical/cdparanoia/files/cdparanoia-III-05-gcc4.3.patch @@ -0,0 +1,579 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 04-gcc4.3.dpatch by Monty +## +## DP: Changeset 15338: Commit fix for 'private' becoming a reserved keyword as +## DP: of GCC 4.3+ (Closes: #499676). + +@DPATCH@ + +================================================================================ +--- cdparanoia-III-10.2/interface/cdda_interface.h ++++ cdparanoia-III-10.2/interface/cdda_interface.h +@@ -84,7 +84,7 @@ + int is_atapi; + int is_mmc; + +- cdda_private_data_t *private; ++ cdda_private_data_t *private_data; + void *reserved; + unsigned char inqbytes[4]; + +--- cdparanoia-III-10.2/interface/cooked_interface.c ++++ cdparanoia-III-10.2/interface/cooked_interface.c +@@ -13,13 +13,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +--- cdparanoia-III-10.2/interface/interface.c ++++ cdparanoia-III-10.2/interface/interface.c +@@ -39,9 +39,9 @@ + if(d->drive_model)free(d->drive_model); + if(d->cdda_fd!=-1)close(d->cdda_fd); + if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + + free(d); +@@ -127,7 +127,7 @@ + } + } + } +- if(ms)*ms=d->private->last_milliseconds; ++ if(ms)*ms=d->private_data->last_milliseconds; + return(sectors); + } + +--- cdparanoia-III-10.2/interface/scan_devices.c ++++ cdparanoia-III-10.2/interface/scan_devices.c +@@ -270,11 +270,11 @@ + d->interface=COOKED_IOCTL; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); + return(d); +@@ -680,15 +680,15 @@ + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; + d->messagedest = messagedest; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + if(use_sgio){ + d->interface=SGIO_SCSI; +- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); ++ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); + g_fd=d->cdda_fd=dup(d->ioctl_fd); + }else{ + version=verify_SG_version(d,messagedest,messages); +@@ -702,8 +702,8 @@ + } + + /* malloc our big buffer for scsi commands */ +- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + } + + { +@@ -778,9 +778,9 @@ + if(i_fd!=-1)close(i_fd); + if(g_fd!=-1)close(g_fd); + if(d){ +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + free(d); + } +@@ -827,7 +827,7 @@ + d->interface=TEST_INTERFACE; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + d->drive_model=copystring("File based test interface"); + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); + +--- cdparanoia-III-10.2/interface/scsi_interface.c ++++ cdparanoia-III-10.2/interface/scsi_interface.c +@@ -15,13 +15,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +@@ -96,7 +96,7 @@ + static void clear_garbage(cdrom_drive *d){ + fd_set fdset; + struct timeval tv; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + int flag=0; + + /* clear out any possibly preexisting garbage */ +@@ -185,7 +185,7 @@ + struct timespec tv2; + int tret1,tret2; + int status = 0; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + long writebytes=SG_OFF+cmd_len+in_size; + + /* generic scsi device services */ +@@ -195,7 +195,7 @@ + + memset(sg_hd,0,sizeof(sg_hd)); + memset(sense_buffer,0,SG_MAX_SENSE); +- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); ++ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); + sg_hd->twelve_byte = cmd_len == 12; + sg_hd->result = 0; + sg_hd->reply_len = SG_OFF + out_size; +@@ -209,7 +209,7 @@ + tell if the command failed. Scared yet? */ + + if(bytecheck && out_size>in_size){ +- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); ++ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); + /* the size does not remove cmd_len due to the way the kernel + driver copies buffers */ + writebytes+=(out_size-in_size); +@@ -243,7 +243,7 @@ + } + + sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); +- tret1=clock_gettime(d->private->clock,&tv1); ++ tret1=clock_gettime(d->private_data->clock,&tv1); + errno=0; + status = write(d->cdda_fd, sg_hd, writebytes ); + +@@ -289,7 +289,7 @@ + } + } + +- tret2=clock_gettime(d->private->clock,&tv2); ++ tret2=clock_gettime(d->private_data->clock,&tv2); + errno=0; + status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); + sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); +@@ -313,7 +313,7 @@ + if(bytecheck && in_size+cmd_lenprivate->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -326,9 +326,9 @@ + + errno=0; + if(tret1<0 || tret2<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; + } + return(0); + } +@@ -347,7 +347,7 @@ + + memset(&hdr,0,sizeof(hdr)); + memset(sense,0,sizeof(sense)); +- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); ++ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); + + hdr.cmdp = cmd; + hdr.cmd_len = cmd_len; +@@ -355,7 +355,7 @@ + hdr.mx_sb_len = SG_MAX_SENSE; + hdr.timeout = 50000; + hdr.interface_id = 'S'; +- hdr.dxferp = d->private->sg_buffer; ++ hdr.dxferp = d->private_data->sg_buffer; + hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ + + /* scary buffer fill hack */ +@@ -400,7 +400,7 @@ + if(bytecheck && in_sizeprivate->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -412,7 +412,7 @@ + } + + /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ +- /* d->private->last_milliseconds = hdr.duration; */ ++ /* d->private_data->last_milliseconds = hdr.duration; */ + + errno = 0; + return 0; +@@ -445,9 +445,9 @@ + + handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); + +- key = d->private->sg_buffer[2] & 0xf; +- ASC = d->private->sg_buffer[12]; +- ASCQ = d->private->sg_buffer[13]; ++ key = d->private_data->sg_buffer[2] & 0xf; ++ ASC = d->private_data->sg_buffer[12]; ++ ASCQ = d->private_data->sg_buffer[13]; + + if(key == 2 && ASC == 4 && ASCQ == 1) return 0; + return 1; +@@ -492,7 +492,7 @@ + if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); + + { +- unsigned char *b=d->private->sg_buffer; ++ unsigned char *b=d->private_data->sg_buffer; + if(b[0])return(1); /* Handles only up to 256 bytes */ + if(b[6])return(1); /* Handles only up to 256 bytes */ + +@@ -604,8 +604,8 @@ + static unsigned int get_orig_sectorsize(cdrom_drive *d){ + if(mode_sense(d,12,0x01))return(-1); + +- d->orgdens = d->private->sg_buffer[4]; +- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); ++ d->orgdens = d->private_data->sg_buffer[4]; ++ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); + } + + /* switch CDROM scsi drives to given sector size */ +@@ -664,8 +664,8 @@ + return(-4); + } + +- first=d->private->sg_buffer[2]; +- last=d->private->sg_buffer[3]; ++ first=d->private_data->sg_buffer[2]; ++ last=d->private_data->sg_buffer[3]; + tracks=last-first+1; + + if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { +@@ -683,7 +683,7 @@ + return(-5); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=i; +@@ -704,7 +704,7 @@ + return(-2); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=0xAA; +@@ -738,7 +738,7 @@ + } + + /* copy to our structure and convert start sector */ +- tracks = d->private->sg_buffer[1]; ++ tracks = d->private_data->sg_buffer[1]; + if (tracks > MAXTRK) { + cderror(d,"003: CDROM reporting illegal number of tracks\n"); + return(-3); +@@ -754,33 +754,33 @@ + return(-5); + } + +- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; ++ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; + d->disc_toc[i].bTrack = i + 1; + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- (((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5])); ++ (((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5])); + } + + d->disc_toc[i].bFlags = 0; + d->disc_toc[i].bTrack = i + 1; +- memcpy (&foo, d->private->sg_buffer+2, 4); +- memcpy (&bar, d->private->sg_buffer+6, 4); ++ memcpy (&foo, d->private_data->sg_buffer+2, 4); ++ memcpy (&bar, d->private_data->sg_buffer+6, 4); + d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + + be32_to_cpu(bar)); + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- ((((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5]))+ ++ ((((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5]))+ + +- ((((signed char)(d->private->sg_buffer[6])<<24) | +- (d->private->sg_buffer[7]<<16)| +- (d->private->sg_buffer[8]<<8)| +- (d->private->sg_buffer[9])))); ++ ((((signed char)(d->private_data->sg_buffer[6])<<24) | ++ (d->private_data->sg_buffer[7]<<16)| ++ (d->private_data->sg_buffer[8]<<8)| ++ (d->private_data->sg_buffer[9])))); + + + d->cd_extra = FixupTOC(d,tracks+1); +@@ -817,7 +817,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -836,7 +836,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -854,7 +854,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -872,7 +872,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -890,7 +890,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -908,7 +908,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -922,7 +922,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -936,7 +936,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -950,7 +950,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -964,7 +964,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -978,7 +978,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -992,7 +992,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1026,7 +1026,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1039,7 +1039,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1052,7 +1052,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1275,7 +1275,7 @@ + static int count_2352_bytes(cdrom_drive *d){ + long i; + for(i=2351;i>=0;i--) +- if(d->private->sg_buffer[i]!=(unsigned char)'\177') ++ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') + return(((i+3)>>2)<<2); + + return(0); +@@ -1284,7 +1284,7 @@ + static int verify_nonzero(cdrom_drive *d){ + long i,flag=0; + for(i=0;i<2352;i++) +- if(d->private->sg_buffer[i]!=0){ ++ if(d->private_data->sg_buffer[i]!=0){ + flag=1; + break; + } +@@ -1625,7 +1625,7 @@ + d->is_mmc=0; + if(mode_sense(d,22,0x2A)==0){ + +- b=d->private->sg_buffer; ++ b=d->private_data->sg_buffer; + b+=b[3]+4; + + if((b[0]&0x3F)==0x2A){ +@@ -1673,7 +1673,7 @@ + cderror(d,"008: Unable to identify CDROM model\n"); + return(NULL); + } +- return (d->private->sg_buffer); ++ return (d->private_data->sg_buffer); + } + + int scsi_init_drive(cdrom_drive *d){ +@@ -1742,8 +1742,8 @@ + check_cache(d); + + d->error_retry=1; +- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + d->report_all=1; + return(0); + } +--- cdparanoia-III-10.2/interface/test_interface.c ++++ cdparanoia-III-10.2/interface/test_interface.c +@@ -66,9 +66,9 @@ + if(!fd)fd=fdopen(d->cdda_fd,"r"); + + if(beginprivate->last_milliseconds=20; ++ d->private_data->last_milliseconds=20; + else +- d->private->last_milliseconds=sectors; ++ d->private_data->last_milliseconds=sectors; + + #ifdef CDDA_TEST_UNDERRUN + sectors-=1; diff --git a/hardware/optical/cdparanoia/pspec.xml b/hardware/optical/cdparanoia/pspec.xml new file mode 100644 index 0000000000..8d088e5da8 --- /dev/null +++ b/hardware/optical/cdparanoia/pspec.xml @@ -0,0 +1,82 @@ + + + + + cdparanoia + http://www.xiph.org/paranoia/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + library + An advanced CDDA reader with error correction + cdparanoia is an advanced CDDA (audio CD) reader with error correction. + http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz + + build_system.patch + cdparanoia-III-05-gcc4.3.patch + + + + + cdparanoia + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/man + + + + + cdparanoia-devel + Development files for cdparanoia + + cdparanoia + + + /usr/include + + + + + + 2014-05-20 + 3.10.2 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-03-10 + 3.10.2 + Rebuild for patch + Burak Fazıl Ertürk + burakerturk@pisilinux.org + + + 2014-01-01 + 3.10.2 + Release bump and clean + Burak Fazıl Ertürk + burakerturk@pisilinux.org + + + 2013-09-14 + 3.10.2 + *Release bump. + *Disable patch + Burak Fazıl Ertürk + burakerturk@pisilinux.org + + + 2010-10-13 + 3.10.2 + First release + Pisi Linux Admins + admins@pisilinux.org + + + \ No newline at end of file diff --git a/hardware/optical/cdparanoia/translations.xml b/hardware/optical/cdparanoia/translations.xml new file mode 100644 index 0000000000..cbbc87950d --- /dev/null +++ b/hardware/optical/cdparanoia/translations.xml @@ -0,0 +1,12 @@ + + + + cdparanoia + Hata düzeltme fonksiyonlu gelişmiş bir CDDA okuyucu + + + + cdparanoia-devel + cdparanoia için geliştirme dosyaları + + diff --git a/hardware/optical/component.xml b/hardware/optical/component.xml new file mode 100644 index 0000000000..c15b076309 --- /dev/null +++ b/hardware/optical/component.xml @@ -0,0 +1,3 @@ + + hardware.optical + diff --git a/multimedia/misc/libdvdcss/actions.py b/multimedia/misc/libdvdcss/actions.py new file mode 100644 index 0000000000..e096f73120 --- /dev/null +++ b/multimedia/misc/libdvdcss/actions.py @@ -0,0 +1,23 @@ +#!/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 + +def setup(): + autotools.autoreconf("-fi") + autotools.configure("--disable-static \ + --disable-doc \ + --disable-dependency-tracking") + +def build(): + autotools.make() + +def install(): + autotools.install() + + pisitools.dohtml("doc/*.html") + pisitools.dodoc("ChangeLog", "AUTHORS", "NEWS", "README") diff --git a/multimedia/misc/libdvdcss/pspec.xml b/multimedia/misc/libdvdcss/pspec.xml new file mode 100644 index 0000000000..cb2341cc31 --- /dev/null +++ b/multimedia/misc/libdvdcss/pspec.xml @@ -0,0 +1,68 @@ + + + + + libdvdcss + http://www.videolan.org/libdvdcss/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + A portable abstraction library for DVD decryption + libdvdcss is a simple and library portable abstraction library designed for accessing DVDs like a block device without having to bother about the decryption. A DVD player can be built around the libdvdcss API using no more than 4 or 5 library calls. + http://download.videolan.org/pub/libdvdcss/1.3.0/libdvdcss-1.3.0.tar.bz2 + + + + libdvdcss + + /usr/lib + /usr/share/doc + + + + + libdvdcss-devel + Development files for libdvdcss + + libdvdcss + + + /usr/include/dvdcss + /usr/lib/pkgconfig + + + + + + 2014-09-29 + 1.3.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-05-21 + 1.2.13 + Rebuild. + Kamil Atlı + suvarice@gmail.com + + + 2014-01-29 + 1.2.13 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2012-08-29 + 1.2.12 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/multimedia/misc/libdvdcss/translations.xml b/multimedia/misc/libdvdcss/translations.xml new file mode 100644 index 0000000000..1ee3783fe3 --- /dev/null +++ b/multimedia/misc/libdvdcss/translations.xml @@ -0,0 +1,15 @@ + + + + libdvdcss + DVD çözmek için soyutlanmış taşınabilir bir kütüphane + Libdvdcss, şifre çözme konusunda zahmete girmeden bir blok aygıt gibi DVD'lere erişim için düzenlenmiş basit ve soyutlanmış taşınabilir bir kütüphanedir. Bir DVD çalıcısı libdvdcss API etrafında 4 veya 5'ten fazla olmaksızın kütüphane çağrısı kullanarak kurulabilir. + libdvdcss est une librairie simple et portable d'abstraction conçue pour accéder auxDVDs comme des périphériques par blocs sans avoir à se soucier du décodage. On peut construire un lecteur DVD à partir de l'API de libdvdcss en 4 ou 5 appels. + libdvdcss es una liraría simple y portable de abstracción para acceder a DVDs como a dispositivos de bloques, sin preocuparse de decriptación. Se puede construir un reproductor DVD alrededor el API libdvdcss con no más de 4 o 5 llamadas de librería. + + + + libdvdcss-devel + libdvdcss için geliştirme dosyaları + + diff --git a/multimedia/misc/libdvdread/actions.py b/multimedia/misc/libdvdread/actions.py new file mode 100644 index 0000000000..7b4075db24 --- /dev/null +++ b/multimedia/misc/libdvdread/actions.py @@ -0,0 +1,29 @@ +#!/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 +# +# taken from +# svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import libtools +from pisi.actionsapi import get + +def setup(): + libtools.libtoolize("--force --install") + autotools.autoreconf("-vfi") + + autotools.configure("--with-libdvdcss=/usr \ + --disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall('DESTDIR="%s"' % get.installDIR()) + + pisitools.dodoc("ChangeLog", "AUTHORS", "README", "TODO") + diff --git a/multimedia/misc/libdvdread/pspec.xml b/multimedia/misc/libdvdread/pspec.xml new file mode 100644 index 0000000000..3c5742c4f9 --- /dev/null +++ b/multimedia/misc/libdvdread/pspec.xml @@ -0,0 +1,92 @@ + + + + + libdvdread + http://www.mplayerhq.hu/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + Provides a simple foundation for reading DVD-Video images + A DVD player for the Solaris, Linux and BSD environments released under the GNU Public License (GPL). It is includes bookmarks, time skipping, multichannel audio, SPDIF output, crop and zoom video. It supports DVD menus and navigation, reads from mounted, unmounted DVDs and hard drive and reads encrypted and unencrypted DVDs using libdvdread/libdvdcss. + http://download.videolan.org/pub/videolan/libdvdread/5.0.2/libdvdread-5.0.2.tar.bz2 + + libdvdcss-devel + git + + + + + libdvdread + + libdvdcss + glibc + + + /usr/lib + /usr/share/doc/libdvdread + + + + + libdvdread-devel + Development files for libdvdread + + libdvdread + + + /usr/bin + /usr/include + /usr/share/aclocal + /usr/lib/pkgconfig + + + + + + 2015-01-31 + 5.0.2 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2015-01-28 + 5.0.1 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-09-29 + 5.0.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-05-24 + 4.9.9 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2013-03-08 + 4.2.0 + V.Bump + PisiLinux Community + admins@pisilinux.org + + + 2010-10-12 + 0.0_20100819 + First release + Pisi Linux Admins + admins@pisilinux.org + + + diff --git a/multimedia/misc/libdvdread/translations.xml b/multimedia/misc/libdvdread/translations.xml new file mode 100644 index 0000000000..4ef5a0ae24 --- /dev/null +++ b/multimedia/misc/libdvdread/translations.xml @@ -0,0 +1,15 @@ + + + + libdvdread + DVD videolarını okumak için basit bir kütüphane + GNU Public License (GPL) altındaki Solaris, Linux ve BSD ortamları için bir DVD oynatıcısıdır. Yerimi, zaman atlatma, çoklukanal ses çıktı, SPDIF çıktı, video kırpma ve büyütme özellikleri içerir. DVD menüleri ve dolaşma özelliğini destekler, bağlanmış (mount) ve bağlanmamış sabit diskleri okur ve libdvdread / libdvdcss kullanan şifreli ve şifresiz DVDleri oynatabilir. + Un lecteur DVD pour les environnements Solaris, Linux et BSD publié sous la licence publique GNU (GPL). Il gère les signets, les sauts dans le temps, les sorties audio sur plusieurs canaux, sortie SPDIF, le zoom et le crop (vision exclusive d'une zone) vidéo. Il gère également les menus DVD et la navigation, permet de lire depuis les DVD montés ou non montés, depuis un disque dur. Il peut lire les DVDs cryptés et non cryptés grâce à libdvdread/libdvdcss. + DVD player para Solaris, Linux y BSD liberado bajo la licencia GNU Public License (GPL). incluye marcadores (bookmarks), time skipping, multichannel audio, salida SPDIF, video crop y zoom. soporta menús DVD y navegación, lee de DVDs y discos rígidos montados y no-montados y lee DVDs encriptados y no-encriptados usando libdvdread/libdvdcss. + + + + libdvdread-devel + libdvdread için geliştirme dosyaları + + diff --git a/multimedia/sound/libvisual/actions.py b/multimedia/sound/libvisual/actions.py new file mode 100644 index 0000000000..3fb79a2542 --- /dev/null +++ b/multimedia/sound/libvisual/actions.py @@ -0,0 +1,23 @@ +#!/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.configure("--enable-shared \ + --disable-static \ + --enable-nls \ + --enable-threads") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("ChangeLog", "NEWS", "TODO", "README", "AUTHORS") diff --git a/multimedia/sound/libvisual/files/disable_altivec.patch b/multimedia/sound/libvisual/files/disable_altivec.patch new file mode 100644 index 0000000000..52cc9f541f --- /dev/null +++ b/multimedia/sound/libvisual/files/disable_altivec.patch @@ -0,0 +1,29 @@ +diff -Nur libvisual-0.4.0-old/libvisual/lv_cpu.c libvisual-0.4.0/libvisual/lv_cpu.c +--- libvisual-0.4.0-old/libvisual/lv_cpu.c 2008-06-16 04:58:57.000000000 +0300 ++++ libvisual-0.4.0/libvisual/lv_cpu.c 2008-06-16 04:59:32.000000000 +0300 +@@ -76,7 +76,7 @@ + + /* The sigill handlers */ + #if defined(VISUAL_ARCH_X86) //x86 (linux katmai handler check thing) +-#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC) ++#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE) + static void sigill_handler_sse( int signal, struct sigcontext sc ) + { + /* Both the "xorps %%xmm0,%%xmm0" and "divps %xmm0,%%xmm1" +@@ -109,7 +109,7 @@ + } + } + #endif +-#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE && X86_FXSR_MAGIC */ ++#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE */ + + #if defined(VISUAL_OS_WIN32) + LONG CALLBACK win32_sig_handler_sse(EXCEPTION_POINTERS* ep) +@@ -143,6 +143,7 @@ + + static void check_os_altivec_support( void ) + { ++ return; + #if defined(VISUAL_OS_DARWIN) + int sels[2] = {CTL_HW, HW_VECTORUNIT}; + int has_vu = 0; diff --git a/multimedia/sound/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch b/multimedia/sound/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch new file mode 100644 index 0000000000..11ce3340cf --- /dev/null +++ b/multimedia/sound/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch @@ -0,0 +1,61 @@ +diff -ru libvisual-0.4.0.orig/libvisual/lv_cache.c libvisual-0.4.0/libvisual/lv_cache.c +--- libvisual-0.4.0.orig/libvisual/lv_cache.c 2009-03-07 17:17:38.000000000 +0000 ++++ libvisual-0.4.0/libvisual/lv_cache.c 2009-03-07 17:25:26.000000000 +0000 +@@ -32,7 +32,7 @@ + static int cache_dtor (VisObject *object); + static int cache_remove_list_entry (VisCache *cache, VisListEntry **le); + +-static inline void handle_request_reset (VisCache *cache, VisListEntry *le); ++static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le); + + static int cache_dtor (VisObject *object) + { +@@ -74,7 +74,7 @@ + } + + +-static inline void handle_request_reset (VisCache *cache, VisListEntry *le) ++static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le) + { + VisCacheEntry *centry; + +diff -ru libvisual-0.4.0.orig/libvisual/lv_defines.h libvisual-0.4.0/libvisual/lv_defines.h +--- libvisual-0.4.0.orig/libvisual/lv_defines.h 2009-03-07 17:17:38.000000000 +0000 ++++ libvisual-0.4.0/libvisual/lv_defines.h 2009-03-07 17:24:17.000000000 +0000 +@@ -63,13 +63,13 @@ + + /* Compiler specific optimalization macros */ + #if __GNUC__ >= 3 +-# define inline inline __attribute__ ((always_inline)) ++# define lv_inline inline __attribute__ ((always_inline)) + # define __malloc __attribute__ ((malloc)) + # define __packed __attribute__ ((packed)) + # define VIS_LIKELY(x) __builtin_expect (!!(x), 1) + # define VIS_UNLIKELY(x) __builtin_expect (!!(x), 0) + #else +-# define inline /* no inline */ ++# define lv_inline /* no inline */ + # define __malloc /* no malloc */ + # define __packed /* no packed */ + # define VIS_LIKELY(x) (x) +diff -ru libvisual-0.4.0.orig/libvisual/lv_time.h libvisual-0.4.0/libvisual/lv_time.h +--- libvisual-0.4.0.orig/libvisual/lv_time.h 2009-03-07 17:17:38.000000000 +0000 ++++ libvisual-0.4.0/libvisual/lv_time.h 2009-03-07 17:25:15.000000000 +0000 +@@ -101,7 +101,7 @@ + * + * @return Nothing. + */ +-static inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi) ++static lv_inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi) + { + #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) + __asm __volatile +@@ -115,7 +115,7 @@ + } + + /* FIXME use uint64_t here, make sure type exists */ +-static inline unsigned long long visual_timer_tsc_get_returned () ++static lv_inline unsigned long long visual_timer_tsc_get_returned () + { + uint32_t lo, hi; + diff --git a/multimedia/sound/libvisual/pspec.xml b/multimedia/sound/libvisual/pspec.xml new file mode 100644 index 0000000000..04a2fea5af --- /dev/null +++ b/multimedia/sound/libvisual/pspec.xml @@ -0,0 +1,89 @@ + + + + + libvisual + http://libvisual.sourceforge.net + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + Abstraction library for audio visualisation plugins + libvisual is an abstraction library that comes between applications and audio visualisation plugins. + mirrors://sourceforge/libvisual/libvisual-0.4.0.tar.bz2 + + disable_altivec.patch + libvisual-0.4.0-inlinedefineconflict.patch + + + + + + + + libvisual + + /usr/lib + /usr/share/doc + /usr/share/locale + + + + + libvisual-32bit + emul32 + 32-bit shared libraries for libvisual + emul32 + + glibc-32bit + + + /usr/lib32 + + + libvisual + glibc-32bit + + + + + libvisual-devel + Development files for libvisual + + libvisual + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + /usr/share/man/man3 + + + + + + 2014-05-20 + 0.4.0 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-14 + 0.4.0 + Add emul32 + Marcin Bojara + marcin@pisilinux.org + + + 2010-10-12 + 0.4.0 + First release + Pisi Linux Admins + admins@pisilinux.org + + + diff --git a/multimedia/sound/libvisual/translations.xml b/multimedia/sound/libvisual/translations.xml new file mode 100644 index 0000000000..48b5c38573 --- /dev/null +++ b/multimedia/sound/libvisual/translations.xml @@ -0,0 +1,15 @@ + + + + libvisual + Ses canlandırma eklentileri için kütüphane + libvisual, uygulamalar ve ses canlandırma eklentileri arasında yer alan bir soyutlama kütüphanesidir. + Libvisual est une librairie d'abstraction venant entre les applications et les plugins (greffons) de visualisation audio. + Libvisual es una librería de abstracción que actúa entre aplicaciones y plugins con funciones audiovisuales. + + + + libvisual-devel + libvisual için geliştirme dosyaları + + diff --git a/multimedia/video/gst-plugins-base/pspec.xml b/multimedia/video/gst-plugins-base/pspec.xml index 04c8425212..cdcfadf250 100644 --- a/multimedia/video/gst-plugins-base/pspec.xml +++ b/multimedia/video/gst-plugins-base/pspec.xml @@ -15,30 +15,33 @@ http://ftp.gnome.org/pub/gnome/sources/gst-plugins-base/0.10/gst-plugins-base-0.10.36.tar.xz gstreamer-devel - libcdio-devel - cdparanoia-devel + gstreamer-next-devel + + pango-devel - cairo-devel + libXv-devel - liboil-devel + libogg-devel - libXext-devel + alsa-lib-devel libvorbis-devel libtheora-devel libvisual-devel gobject-introspection-devel orc-devel - gnome-vfs-devel + gst-plugins-base + zlib + glib2 + libX11 + libxml2 gstreamer - libcdio - cdparanoia pango cairo libXv @@ -49,7 +52,6 @@ libvisual libtheora orc - gnome-vfs /usr/bin @@ -58,7 +60,7 @@ /usr/lib/libgst* /usr/share/doc /usr/share/gir-1.0 - /usr/share/gst-plugins-base + /usr/share/gst-plugins-base /usr/share/man /usr/share/locale @@ -92,6 +94,7 @@ gst-plugins-base orc-32bit zlib-32bit + glibc-32bit glib2-32bit libXv-32bit cairo-32bit @@ -117,6 +120,7 @@ Development files for gst-plugins-base gst-plugins-base + glib2-devel gstreamer-devel diff --git a/multimedia/video/gstreamer-next/pspec.xml b/multimedia/video/gstreamer-next/pspec.xml index 3e7d094b82..7f6fc165b1 100644 --- a/multimedia/video/gstreamer-next/pspec.xml +++ b/multimedia/video/gstreamer-next/pspec.xml @@ -27,7 +27,7 @@ gstreamer-next - + glib2 /usr/bin @@ -51,6 +51,7 @@ glib2-32bit + glibc-32bit gstreamer-next @@ -63,6 +64,7 @@ Development files for gstreamer gstreamer-next + glib2-devel /usr/include diff --git a/multimedia/video/gstreamermm/actions.py b/multimedia/video/gstreamermm/actions.py new file mode 100644 index 0000000000..cf7b3610cb --- /dev/null +++ b/multimedia/video/gstreamermm/actions.py @@ -0,0 +1,22 @@ +#!/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.configure() + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "README*", "NEWS") diff --git a/multimedia/video/gstreamermm/pspec.xml b/multimedia/video/gstreamermm/pspec.xml new file mode 100644 index 0000000000..951a1095e0 --- /dev/null +++ b/multimedia/video/gstreamermm/pspec.xml @@ -0,0 +1,93 @@ + + + + + gstreamermm + http://gstreamer.freedesktop.org/bindings/cplusplus.html + + Osman Erkan + osman.erkan@pisilinux.org + + GPLv2 + library + GStreamer C++ bindings + The GStreamer API C++ bindings are based on gtkmm, using the same lifecycle mechanism. + http://ftp.gnome.org/pub/gnome/sources/gstreamermm/0.10/gstreamermm-0.10.11.tar.xz + + glib2-devel + gstreamer-devel + libxml2-devel + gst-plugins-base-devel + glibmm-devel + libxmlpp-devel + libsigc++ + libgcc + + + + + gstreamermm + + glib2 + libgcc + libxml2 + gstreamer + gst-plugins-base + glibmm + libxmlpp + libsigc++ + + + /usr/lib + /usr/share/devhelp/books/gstreamermm-0.10 + /usr/share/doc + + + + + gstreamermm-devel + gstreamermm için geliştirme dosyaları + + glibmm-devel + libxmlpp-devel + gstreamer-devel + gst-plugins-base-devel + gstreamermm + + + /usr/include/gstreamermm-0.10 + /usr/lib/pkgconfig + + + + + + 2014-05-28 + 0.10.11 + Rebuild. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-27 + 0.10.11 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2014-01-26 + 0.10.11 + Rebuild + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2013-08-08 + 0.10.11 + First release + Osman Erkan + osman.erkan@pisilinux.org + + + diff --git a/multimedia/video/gstreamermm/translations.xml b/multimedia/video/gstreamermm/translations.xml new file mode 100644 index 0000000000..c3820f3a22 --- /dev/null +++ b/multimedia/video/gstreamermm/translations.xml @@ -0,0 +1,13 @@ + + + + gstreamermm + Gstreamer C++ arayüzü + Gstreamer'ın C++ arayüzü gtkmm temel alınarak hazırlanmıştır, aynı yaşam ömrü mekanizmasını kullanır. + + + + gstreamermm-devel + gstreamermm için geliştirme dosyaları + + \ No newline at end of file diff --git a/multimedia/video/libtheora/actions.py b/multimedia/video/libtheora/actions.py new file mode 100644 index 0000000000..9c8d8fc61b --- /dev/null +++ b/multimedia/video/libtheora/actions.py @@ -0,0 +1,30 @@ +#!/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 shelltools +from pisi.actionsapi import get + +def setup(): + if get.buildTYPE() == "emul32": + pisitools.dosed("configure.ac", "(.*OC_X86_64_ASM.*)", r"#\1") + shelltools.system("./autogen.sh") + autotools.configure("--enable-shared \ + --enable-encode \ + --disable-dependency-tracking \ + --disable-spec \ + --disable-sdltest \ + --disable-examples \ + --disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall('DESTDIR="%s" docdir=/%s/libtheora' % (get.installDIR(), get.docDIR())) + + pisitools.dodoc("README", "AUTHORS", "CHANGES") diff --git a/multimedia/video/libtheora/files/flags.patch b/multimedia/video/libtheora/files/flags.patch new file mode 100644 index 0000000000..a47cc57716 --- /dev/null +++ b/multimedia/video/libtheora/files/flags.patch @@ -0,0 +1,14 @@ +diff -ur libtheora-1.0beta2.orig/configure.ac libtheora-1.0beta2/configure.ac +--- libtheora-1.0beta2.orig/configure.ac 2007-10-13 00:01:38.000000000 +0300 ++++ libtheora-1.0beta2/configure.ac 2007-11-25 22:44:49.000000000 +0200 +@@ -102,8 +102,8 @@ + case $host in + *) + DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES" +- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops" +- PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";; ++ CFLAGS="-Wall -Wno-parentheses" ++ PROFILE="-Wall -Wno-parentheses -pg -g -fno-inline-functions -DDEBUG";; + esac + fi + CFLAGS="$CFLAGS $cflags_save" diff --git a/multimedia/video/libtheora/files/libtheora-1.1.1-libpng16.patch b/multimedia/video/libtheora/files/libtheora-1.1.1-libpng16.patch new file mode 100644 index 0000000000..d02277bdd2 --- /dev/null +++ b/multimedia/video/libtheora/files/libtheora-1.1.1-libpng16.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/465450 +http://trac.xiph.org/ticket/1947 + +--- examples/png2theora.c ++++ examples/png2theora.c +@@ -462,9 +462,9 @@ + png_set_strip_alpha(png_ptr); + + row_data = (png_bytep)png_malloc(png_ptr, +- 3*height*width*png_sizeof(*row_data)); ++ 3*height*width*sizeof(*row_data)); + row_pointers = (png_bytep *)png_malloc(png_ptr, +- height*png_sizeof(*row_pointers)); ++ height*sizeof(*row_pointers)); + for(y = 0; y < height; y++) { + row_pointers[y] = row_data + y*(3*width); + } diff --git a/multimedia/video/libtheora/pspec.xml b/multimedia/video/libtheora/pspec.xml new file mode 100644 index 0000000000..6e8987cabc --- /dev/null +++ b/multimedia/video/libtheora/pspec.xml @@ -0,0 +1,94 @@ + + + + + libtheora + http://www.theora.org/ + + PisiLinux Community + admins@pisilinux.org + + BSD + library + The Theora Video Compression Codec + libtheora is Xiph.Org's first publicly released video codec, intended for use within the Ogg's project's Ogg multimedia streaming system. + http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2 + + libogg-devel + libvorbis-devel + + + flags.patch + libtheora-1.1.1-libpng16.patch + + + + + libtheora + + libogg + libvorbis + + + /usr/lib + /usr/share/doc + + + + + libtheora-32bit + emul32 + 32-bit shared libraries for libtheora + emul32 + + libogg-32bit + glibc-32bit + + + libtheora + libogg-32bit + glibc-32bit + + + /usr/lib32 + + + + + libtheora-devel + Development files for libtheora + + libtheora + libogg-devel + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + + 2014-05-20 + 1.1.1 + Rebuild, add libpng16 patch. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-14 + 1.1.1 + Add emul32 + Marcin Bojara + marcin@pisilinux.org + + + 2010-10-12 + 1.1.1 + First release + Pisi Linux Admins + admins@pisilinux.org + + + diff --git a/multimedia/video/libtheora/translations.xml b/multimedia/video/libtheora/translations.xml new file mode 100644 index 0000000000..f96839ff6e --- /dev/null +++ b/multimedia/video/libtheora/translations.xml @@ -0,0 +1,15 @@ + + + + libtheora + Theora video sıkıştırma kodlaması + libtheora, Ogg projesi kapsamında Ogg çokluortam akış sistemi ile beraber kullanılmak üzere tasarlanmış bir video kodlamasıdır. + Le codec (compresseur / décompresseur) de compression vidéo Theora. + Der Theora Video Kompressions-Codec + + + + libtheora-devel + libtheora için geliştirme dosyaları + + diff --git a/programming/misc/json-glib/pspec.xml b/programming/misc/json-glib/pspec.xml index 677e3539f8..4a4a349fce 100644 --- a/programming/misc/json-glib/pspec.xml +++ b/programming/misc/json-glib/pspec.xml @@ -39,6 +39,7 @@ Development files for json-glib json-glib + glib2-devel /usr/include diff --git a/programming/misc/libinput/actions.py b/programming/misc/libinput/actions.py new file mode 100644 index 0000000000..e0abb97808 --- /dev/null +++ b/programming/misc/libinput/actions.py @@ -0,0 +1,21 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/copyleft/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.dosym("libinput.so.5.0.0","/usr/lib/libinput.so.0") + + #pisitools.dodoc("COPYING", "README") diff --git a/programming/misc/libinput/pspec.xml b/programming/misc/libinput/pspec.xml new file mode 100644 index 0000000000..57dc29356d --- /dev/null +++ b/programming/misc/libinput/pspec.xml @@ -0,0 +1,87 @@ + + + + + libinput + http://www.freedesktop.org/wiki/Software/libinput/ + + Alihan Öztürk + alihan@pisilinux.org + + X11 + app:console + library that handles input devices for display servers and other applications that need to directly deal with input devices. + It provides device detection, device handling, input device event processing and abstraction so minimize the amount of custom input code the user of libinput need to provide the common set of functionality that users expect. + + libevdev + eudev-devel + libmtdev-devel + + http://www.freedesktop.org/software/libinput/libinput-0.20.0.tar.xz + + + + libinput + + libevdev + libmtdev + + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/man/man1 + + + + + libinput-devel + Development files for libinput + + libinput + eudev-devel + + + /usr/include + /usr/lib/pkgconfig + + + + + + 2015-07-21 + 0.20.0 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2015-02-16 + 0.10.0 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-10-25 + 0.6.0 + Add symbolic link. + Ekin Dursun + ekin.dursun@pisilinux.org + + + 2014-09-19 + 0.6.0 + Version bump.. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-05-27 + 0.2.0 + First release. + Alihan Öztürk + alihan@pisilinux.org + + + diff --git a/programming/misc/libinput/translations.xml b/programming/misc/libinput/translations.xml new file mode 100644 index 0000000000..ca8d2c4d91 --- /dev/null +++ b/programming/misc/libinput/translations.xml @@ -0,0 +1,8 @@ + + + + libinput + libinput Wayland Campasitars giriş aygıtları işlemek için ve genel X.Org giriş sürücü sağlamak için bir kütüphane. + Bu yüzden kullanıcıların beklediği fonksiyonellik ortak kümesi sağlamak için gereken özel giriş kodu compositors miktarını en az indirerek, aygıt kullanımı, giriş aygıtı olay işleme ve soyutlama sağlar. + + diff --git a/programming/misc/libsigc++/actions.py b/programming/misc/libsigc++/actions.py new file mode 100644 index 0000000000..b068492202 --- /dev/null +++ b/programming/misc/libsigc++/actions.py @@ -0,0 +1,32 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + # dont waste time building examples, docs and tests + pisitools.dosed("Makefile.in", " tests examples docs") + + autotools.configure("--disable-static") + + pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.removeDir("/usr/share/devhelp") + + #move html docs to html doc dir + pisitools.dodir("/usr/share/doc/%s/html" % get.srcNAME()) + pisitools.domove("/usr/share/doc/%s-2.0/*" % get.srcNAME(), "/usr/share/doc/%s/html" % get.srcNAME()) + pisitools.removeDir("/usr/share/doc/%s-2.0" % get.srcNAME()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "README", "NEWS", "TODO") diff --git a/programming/misc/libsigc++/pspec.xml b/programming/misc/libsigc++/pspec.xml new file mode 100644 index 0000000000..8efd494533 --- /dev/null +++ b/programming/misc/libsigc++/pspec.xml @@ -0,0 +1,80 @@ + + + + + libsigc++ + http://libsigc.sourceforge.net + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + Typesafe signal framework for C++ + libsigc++ is a library which implements a full callback system for use in widget libraries, abstract interfaces, and general programming. + mirrors://gnome/libsigc++/2.4/libsigc++-2.4.1.tar.xz + + + + libsigc++ + + /usr/lib + /usr/share/doc + + + libgcc + + + + + libsigc++-devel + Development files for libsigc++ + + libsigc++ + + + /usr/include + /usr/lib/sigc++*/include + /usr/lib/pkgconfig + + + + + libsigc++-docs + Development documents for libsigc++ + + /usr/share/doc/libsigc++/html + 33e0b0f162eababc310d927246627d62bb25cb63 + + + + + 2015-07-21 + 2.4.1 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2013-05-18 + 2.3.1 + Release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-03-04 + 2.3.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-09-29 + 2.2.11 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/programming/misc/libsigc++/translations.xml b/programming/misc/libsigc++/translations.xml new file mode 100644 index 0000000000..5520dd6798 --- /dev/null +++ b/programming/misc/libsigc++/translations.xml @@ -0,0 +1,19 @@ + + + + libsigc++ + C++ için sinyal altyapısı + libsigc++, widget kitaplıkları, soyut arabirimlerde ve genel programlama esnasında kullanılmak üzere tasarlanmış bir sinyal ve callback altyapısıdır. + Système de rappels à types sûrs (typesafe callback) pour C++. + + + + libsigc++-devel + libsigc++ için geliştirme dosyaları + + + + libsigc++-docs + libsigc++ için geliştirme belgeleri + + diff --git a/programming/misc/libxmlpp/actions.py b/programming/misc/libxmlpp/actions.py new file mode 100644 index 0000000000..04d0ceab5e --- /dev/null +++ b/programming/misc/libxmlpp/actions.py @@ -0,0 +1,30 @@ +#!/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 = "libxml++-%s" % get.srcVERSION() + +def setup(): + autotools.configure("--disable-static \ + --disable-examples \ + --enable-dependency-tracking") + + # for fix unused dependency + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dohtml("docs/reference/html/*") + + pisitools.dodoc("ChangeLog", "AUTHORS", "NEWS", "README*") + #pisitools.removeDir("/usr/share/doc/libxml++-2.6") diff --git a/programming/misc/libxmlpp/pspec.xml b/programming/misc/libxmlpp/pspec.xml new file mode 100644 index 0000000000..d031727945 --- /dev/null +++ b/programming/misc/libxmlpp/pspec.xml @@ -0,0 +1,84 @@ + + + + + libxmlpp + http://libxmlplusplus.sourceforge.net + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + C++ wrapper for the libxml2 XML parser library + libxml++ is a C++ wrapper for the libxml XML parser library. + http://ftp.acc.umu.se/pub/GNOME/sources/libxml++/2.38/libxml++-2.38.1.tar.xz + + glibmm-devel + libsigc++-devel + libxml2-devel + + + + + libxmlpp + + libgcc + libxml2 + glibmm + + + + /usr/lib + /usr/share/doc + + + + + libxmlpp-devel + Development files for libxmlpp + + libxmlpp + glibmm-devel + libxml2-devel + + + /usr/include + /usr/lib/pkgconfig + /usr/lib/libxml++-2.6 + + + + + libxmlpp-docs + Development documents for libxmlpp in HTML + + /usr/share/doc/libxmlpp/html + /usr/share/devhelp + + + + + + 2015-05-21 + 2.38.1 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2013-10-29 + 2.37.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2011-03-16 + 2.33.2 + First release + Pisi Linux Admins + admins@pisilinux.org + + + diff --git a/programming/misc/libxmlpp/translations.xml b/programming/misc/libxmlpp/translations.xml new file mode 100644 index 0000000000..771c862398 --- /dev/null +++ b/programming/misc/libxmlpp/translations.xml @@ -0,0 +1,19 @@ + + + + libxmlpp2 + libxml XML kütüphanesi için bir C++ arabirimi + libxml XML kütüphanesi için bir C++ arabirimi + enrobage en C++ de la librairie d'analyse XML libxml. + + + + libxmlpp-devel + libxmlpp için geliştirme dosyaları + + + + libxmlpp-docs + libxmlpp için HTML formatında geliştirme belgeleri + + diff --git a/programming/profiler/component.xml b/programming/profiler/component.xml new file mode 100644 index 0000000000..864d871544 --- /dev/null +++ b/programming/profiler/component.xml @@ -0,0 +1,3 @@ + + programming.profiler + diff --git a/programming/profiler/valgrind/actions.py b/programming/profiler/valgrind/actions.py new file mode 100644 index 0000000000..e1cf710bed --- /dev/null +++ b/programming/profiler/valgrind/actions.py @@ -0,0 +1,22 @@ +#!/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 shelltools +from pisi.actionsapi import get + +def setup(): + autotools.autoreconf("-vfi") + autotools.configure("--without-mpicc") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "FAQ.txt", "NEWS", "README*") diff --git a/programming/profiler/valgrind/files/valgrind-3.9.0-glibc-2.19.patch b/programming/profiler/valgrind/files/valgrind-3.9.0-glibc-2.19.patch new file mode 100644 index 0000000000..79a3283c9c --- /dev/null +++ b/programming/profiler/valgrind/files/valgrind-3.9.0-glibc-2.19.patch @@ -0,0 +1,37 @@ +diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure +--- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000 ++++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000 +@@ -6689,6 +6689,16 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.19) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5 ++$as_echo "2.19 family" >&6; } ++ ++$as_echo "#define GLIBC_2_19 1" >>confdefs.h ++ ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 + $as_echo "Darwin" >&6; } +diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac +--- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000 ++++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000 +@@ -918,6 +918,13 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.19) ++ AC_MSG_RESULT(2.19 family) ++ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) diff --git a/programming/profiler/valgrind/files/valgrind-3.9.0-glibc-2.21.patch b/programming/profiler/valgrind/files/valgrind-3.9.0-glibc-2.21.patch new file mode 100644 index 0000000000..37a93d14c5 --- /dev/null +++ b/programming/profiler/valgrind/files/valgrind-3.9.0-glibc-2.21.patch @@ -0,0 +1,54 @@ +diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure +--- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000 ++++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000 +@@ -6689,6 +6689,26 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.20) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5 ++$as_echo "2.20 family" >&6; } ++ ++$as_echo "#define GLIBC_2_20 1" >>confdefs.h ++ ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; ++ 2.21) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.21 family" >&5 ++$as_echo "2.21 family" >&6; } ++ ++$as_echo "#define GLIBC_2_21 1" >>confdefs.h ++ ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 + $as_echo "Darwin" >&6; } +diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac +--- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000 ++++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000 +@@ -918,6 +918,20 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.20) ++ AC_MSG_RESULT(2.20 family) ++ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; ++ 2.21) ++ AC_MSG_RESULT(2.21 family) ++ AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) diff --git a/programming/profiler/valgrind/pspec.xml b/programming/profiler/valgrind/pspec.xml new file mode 100644 index 0000000000..2349746cb4 --- /dev/null +++ b/programming/profiler/valgrind/pspec.xml @@ -0,0 +1,80 @@ + + + + + valgrind + http://www.valgrind.org + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + Memory access debugger for X86 and PPC Linux platforms + Valgrind is an award-winning suite of tools for debugging and profiling Linux programs. With the tools that come with Valgrind, you can automatically detect many memory management and threading bugs, avoiding hours of frustrating bug-hunting, making your programs more stable. You can also perform detailed profiling, to speed up and reduce memory use of your programs. + http://www.valgrind.org/downloads/valgrind-3.10.1.tar.bz2 + + glibc-devel + + + + valgrind-3.9.0-glibc-2.21.patch + + + + + valgrind + + /usr/bin + /usr/include/valgrind + /usr/lib + /usr/share/doc/valgrind + /usr/share/man + + + + + + 2015-07-21 + 3.10.1 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-10-31 + 3.10.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-20 + 3.9.0 + Rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-02-08 + 3.9.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-19 + 3.8.1 + Add glibc-2.17 patch. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-10-24 + 3.8.1 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/programming/profiler/valgrind/translations.xml b/programming/profiler/valgrind/translations.xml new file mode 100644 index 0000000000..aab645d0af --- /dev/null +++ b/programming/profiler/valgrind/translations.xml @@ -0,0 +1,8 @@ + + + + valgrind + X86 ve PPC Linux platformları için bellek erişimi hata ayıklayıcı + Valgrind, bu konuda ödül kazanmış Linux için çizge ve hata ayıklama araçları takımıdır. Valgrind ile gelen araçlar yardımıyla, birçok hafıza yönetimi ve iş parçacığı hatalarını otomatik olarak yakalayabilir, boşa geçen hata ayıklama saatlerinizi kazanabilir, programlarınızı daha kararlı bir hale getirebilirsiniz. Ayrıca programlarınızı daha hızlı çalışır yapmak ve kullandıkları hafızayı azaltmak için iş parçacıklarını detaylı olarak inceleyebilirsiniz. + +