Compare commits

..

38 Commits

Author SHA1 Message Date
TDE Gitea fb9aebd316 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea b7b8e55e9b Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea a7d2815595 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
Slávek Banko 976f2a92bc
Raise the minimum required version of CMake to 2.8.12.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit dbcec28f5a)
5 years ago
TDE Gitea 134e437677 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 17174fbe03 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
Slávek Banko c6d0b9123f
Update version number to R14.0.10.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
5 years ago
TDE Gitea 522b6ba6f5 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
gregory guy c64cc0c3b3
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>
(cherry picked from commit 8349a964c2)
5 years ago
Michele Calgaro 000a818a2c
Removed unused files and changed file names to conform to .cmake convention for configuration files.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit df378ddc98)
5 years ago
TDE Gitea fb5d1ca135 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea f99a536177 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 5f5d76cd6e Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 2ed579c3a0 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 62e9350c24 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 21f3a4bb76 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 4ef1efb472 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea dd44c03b6d Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 62c666fab3 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea b0911fbff2 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea ec23259f89 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
Michele Calgaro 3e05ace790
Update release version number to R14.0.9.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
5 years ago
TDE Gitea b2bfefbc7e Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 7bbf531110 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea fa91efbfec Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
TDE Gitea 2a990ab7a1 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 5 years ago
Slávek Banko cea19afda9
Update version number for R14.0.8 final release.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
6 years ago
TDE Gitea 7fb4342121 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
TDE Gitea 248ee754c9 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
TDE Gitea 3369be170f Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
TDE Gitea 0a95e80702 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
TDE Gitea c4942a6a59 Reset submodule main/dependencies/libart-lgpl/cmake to latest HEAD 6 years ago
Slávek Banko 7f058ae278
cmake: Add tests.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 11cb023db2)
7 years ago
Slávek Banko b314a5b4a8
Add support for GCC hidden visibility.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2a50894a43)
7 years ago
Slávek Banko db23722ddb
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>
(cherry picked from commit 87237501c5)
7 years ago
gregory guy 32fc564b71
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>
(cherry picked from commit b996d3d1de)
7 years ago
Slávek Banko b72d215669
Use pkg-config to get values in libart2-config.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7c59d8ccd2)
7 years ago
Timothy Pearson e041d2bbeb Minor update to AUTHORS file
(cherry picked from commit d5cb41f44a)
10 years ago

3
.gitmodules vendored

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

@ -7,16 +7,13 @@
############################################ ############################################
##### set project version ######################## cmake_minimum_required( VERSION 2.8.12 )
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} )
@ -36,6 +33,7 @@ include( CheckCSourceCompiles )
#### include our cmake modules #### include our cmake modules
set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros ) include( TDEMacros )

@ -0,0 +1 @@
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 __TDE_HAVE_GCC_VISIBILITY 1 #cmakedefine __KDE_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(__TDE_HAVE_GCC_VISIBILITY) || defined(G_HAVE_GCC_VISIBILITY) #if defined(__KDE_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,6 +48,9 @@ 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",
@ -65,10 +68,6 @@ 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