Compare commits

..

45 Commits

Author SHA1 Message Date
Michele Calgaro 36494a76f1
Rename __KDE_HAVE_GCC_VISIBILITY to __TDE_HAVE_GCC_VISIBILITY
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
1 year ago
Michele Calgaro 51eb2b1233
Use centralized cmake version
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Michele Calgaro ef286ccbfc
cmake files: change keywords to lower case
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Slávek Banko f1feef723f
Raise the minimum required version of CMake to 3.5.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
2 years ago
Michele Calgaro 42183671a9
Use TDE cmake macro to set version
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
3 years ago
Michele Calgaro 9f2ffb32cf
Remove obsolete setting of CMAKE_MODULE_PATH in cmake files.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
3 years ago
Slávek Banko 3d29aa4f85
Fix possible memory leak in art_render_new.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 years ago
Slávek Banko b2383291c7
Raise the minimum required version of CMake to 3.1.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 years ago
Slávek Banko e975b2e051
Remove cmake submodule since it has now been replaced by cmake-trinity dependency.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 years ago
TDE Gitea 79f02434a9 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 4 years ago
TDE Gitea 2fba0c5c6e Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 2444b03f08 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 0b952e83fa Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
Slávek Banko dbcec28f5a
Raise the minimum required version of CMake to 2.8.12.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
5 years ago
TDE Gitea 76ef77ff50 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea e2fa9f1e47 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 7a22c0874c Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
gregory guy 8349a964c2
Libart-lgpl moved into a 'src' folder for consistency sake with the other
modules.
Add basic cmake build instructions.
Rework of the README file.
Some cosmetics.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
5 years ago
TDE Gitea 31363763ec Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea d0726eb761 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea c2c90b499b Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 752fe6d147 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 2d7ab35e7e Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea f7a2d046ba Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 3df3d033b0 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea be0fa31108 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 6428ea0b72 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea e83750bbdb Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea ade663c33e Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 05e74f6d21 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 4913e6e0de Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 5ffdc3c71d Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 8014ff6f35 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 30d8c41058 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
TDE Gitea 5557b6ab0c Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
TDE Gitea 84ff7b3b0d Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
TDE Gitea 6a5c8407e0 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
TDE Gitea f2c547e0b1 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
Michele Calgaro df378ddc98
Removed unused files and changed file names to conform to .cmake convention for configuration files.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
6 years ago
Slávek Banko 11cb023db2
cmake: Add tests.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
7 years ago
Slávek Banko 2a50894a43
Add support for GCC hidden visibility.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
7 years ago
Slávek Banko 87237501c5
Move the art_config.h generation to the configure script.
Cleanup of generated automake files.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
7 years ago
gregory guy b996d3d1de
conversion to the cmake building system
Cleanup of generated headers.
Add common cmake submodule.

Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
7 years ago
Slávek Banko 7c59d8ccd2
Use pkg-config to get values in libart2-config.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
7 years ago
Timothy Pearson d5cb41f44a Minor update to AUTHORS file 10 years ago

3
.gitmodules vendored

@ -1,3 +0,0 @@
[submodule "cmake"]
path = cmake
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

@ -7,13 +7,16 @@
############################################ ############################################
cmake_minimum_required( VERSION 2.8.12 ) ##### set project version ########################
include( TDEVersion )
cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
tde_set_project_version( )
#### general package setup #### general package setup
project( libart-lgpl ) project( libart-lgpl )
set( VERSION R14.0.10 )
set( LIBART_VERSION 2.3.21 ) set( LIBART_VERSION 2.3.21 )
string( REPLACE "." ";" LIBART_VERSION_LIST ${LIBART_VERSION} ) string( REPLACE "." ";" LIBART_VERSION_LIST ${LIBART_VERSION} )
@ -33,7 +36,6 @@ include( CheckCSourceCompiles )
#### include our cmake modules #### include our cmake modules
set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros ) include( TDEMacros )

@ -1 +0,0 @@
Subproject commit 0c19587aec8428444d2878fc5e2c966613207f82

@ -1,7 +1,7 @@
#define VERSION "@VERSION@" #define VERSION "@VERSION@"
// Defined if you have fvisibility and fvisibility-inlines-hidden support. // Defined if you have fvisibility and fvisibility-inlines-hidden support.
#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 #cmakedefine __TDE_HAVE_GCC_VISIBILITY 1
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */ significant byte first (like Motorola and SPARC, unlike Intel). */

@ -1,4 +1,4 @@
INSTALL( install(
FILES libart2-config.1 FILES libart2-config.1
DESTINATION ${MAN_INSTALL_DIR}/man1 DESTINATION ${MAN_INSTALL_DIR}/man1
COMPONENT doc COMPONENT doc

@ -11,7 +11,7 @@ typedef @ART_U8_TYPE@ art_u8;
typedef @ART_U16_TYPE@ art_u16; typedef @ART_U16_TYPE@ art_u16;
typedef @ART_U32_TYPE@ art_u32; typedef @ART_U32_TYPE@ art_u32;
#if defined(__KDE_HAVE_GCC_VISIBILITY) || defined(G_HAVE_GCC_VISIBILITY) #if defined(__TDE_HAVE_GCC_VISIBILITY) || defined(G_HAVE_GCC_VISIBILITY)
#define LIBART_NO_EXPORT __attribute__ ((visibility("hidden"))) #define LIBART_NO_EXPORT __attribute__ ((visibility("hidden")))
#define LIBART_EXPORT __attribute__ ((visibility("default"))) #define LIBART_EXPORT __attribute__ ((visibility("default")))
#elif defined(_WIN32) #elif defined(_WIN32)

@ -48,9 +48,6 @@ art_render_new (int x0, int y0, int x1, int y1,
ArtRenderPriv *priv; ArtRenderPriv *priv;
ArtRender *result; ArtRender *result;
priv = art_new (ArtRenderPriv, 1);
result = &priv->super;
if (n_chan > ART_MAX_CHAN) if (n_chan > ART_MAX_CHAN)
{ {
art_warn ("art_render_new: n_chan = %d, exceeds %d max\n", art_warn ("art_render_new: n_chan = %d, exceeds %d max\n",
@ -68,6 +65,10 @@ art_render_new (int x0, int y0, int x1, int y1,
art_warn ("art_render_new: x0 >= x1 (x0 = %d, x1 = %d)\n", x0, x1); art_warn ("art_render_new: x0 >= x1 (x0 = %d, x1 = %d)\n", x0, x1);
return NULL; return NULL;
} }
priv = art_new (ArtRenderPriv, 1);
result = &priv->super;
result->x0 = x0; result->x0 = x0;
result->y0 = y0; result->y0 = y0;
result->x1 = x1; result->x1 = x1;

Loading…
Cancel
Save