[libart-lgpl][master,r14.0.x] 7c59d8cc,b996d3d1,87237501,2a50894a,11cb023d,b72d2156,32fc564b...

Makefile.am

diff --git a/Makefile.am b/Makefile.am

index aec6c5d..a7399d1 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -12,7 +12,6 @@

 EXTRA_DIST = 			\

 	libart.def		\

-	libart-config.in	\

 	libart-2.0.pc.in	\

 	libart-2.0-uninstalled.pc.in

@@ -165,9 +164,6 @@

 pkgconfigdir = $(libdir)/pkgconfig

 pkgconfig_DATA = libart-2.0.pc

-libart2-config: libart-config

-	cp -f libart-config libart2-config

 install-data-local: install-ms-lib install-libtool-import-lib

configure.in

diff --git a/configure.in b/configure.in

index 0010d48..ba44d56 100644

--- a/configure.in

+++ b/configure.in

@@ -108,7 +108,6 @@

 libart-2.0-uninstalled.pc

 libart-zip])

-AC_CONFIG_FILES([libart-config],[chmod +x libart-config])

 AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh])

 AC_OUTPUT

libart-2.0-uninstalled.pc.in

diff --git a/libart-2.0-uninstalled.pc.in b/libart-2.0-uninstalled.pc.in

index f731e54..6dddc9d 100644

--- a/libart-2.0-uninstalled.pc.in

+++ b/libart-2.0-uninstalled.pc.in

@@ -5,6 +5,6 @@

 Name: libart

 Description: LGPL version of the libart library

-Version: @VERSION@

+Version: @LIBART_VERSION@

 Libs: ${pc_top_builddir}/${pcfiledir}/libart_lgpl_2.la

 Cflags: -I${pc_top_builddir}/${pcfiledir}

libart-2.0.pc.in

diff --git a/libart-2.0.pc.in b/libart-2.0.pc.in

index 1df143b..063e1f5 100644

--- a/libart-2.0.pc.in

+++ b/libart-2.0.pc.in

@@ -5,6 +5,6 @@

 Name: libart

 Description: LGPL version of the libart library

-Version: @VERSION@

+Version: @LIBART_VERSION@

 Libs: -L${libdir} -lart_lgpl_2

 Cflags: -I${includedir}/libart-2.0

libart-config.in

diff --git a/libart-config.in b/libart-config.in

deleted file mode 100644

index e32f010..0000000

--- a/libart-config.in

+++ /dev/null

@@ -1,65 +0,0 @@

-#!/bin/sh

-prefix=@prefix@

-exec_prefix=@exec_prefix@

-exec_prefix_set=no

-libs=""

-output_libs=no

-usage="\

-Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"

-if test $# -eq 0; then

-      echo "${usage}" 1>&2

-      exit 1

-fi

-while test $# -gt 0; do

-  case "$1" in

-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;

-  *) optarg= ;;

-  esac

-  case $1 in

-    --prefix=*)

-      prefix=$optarg

-      if test $exec_prefix_set = no ; then

-        exec_prefix=$optarg

-      fi

-      ;;

-    --prefix)

-      echo $prefix

-      ;;

-    --exec-prefix=*)

-      exec_prefix=$optarg

-      exec_prefix_set=yes

-      ;;

-    --exec-prefix)

-      echo $exec_prefix

-      ;;

-    --version)

-      echo @LIBART_VERSION@

-      ;;

-    --cflags)

-      includes=-I@includedir@/libart-2.0

-      echo $includes

-      ;;

-    --libs)

-      libs="$libs -L@libdir@ -lart_lgpl_2"

-      output_libs=yes

-      ;;

-    --static)

-      libs="$libs -lm"

-      ;;

-    *)

-      echo "${usage}" 1>&2

-      exit 1

-      ;;

-  esac

-  shift

-done

-if test $output_libs = yes ; then

-    echo $libs

-fi

libart2-config

diff --git a/libart2-config b/libart2-config

new file mode 100644

index 0000000..2d97c61

--- /dev/null

+++ b/libart2-config

@@ -0,0 +1,68 @@

+#!/bin/sh

+usage="\

+Usage: libart2-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"

+if test $# -eq 0; then

+      echo "${usage}" 1>&2

+      exit 1

+fi

+if ! which pkg-config >/dev/null; then

+    echo "pkg-config not found on your system" 1>&2

+    exit 1

+fi

+prefix=`pkg-config --variable=prefix libart-2.0`

+exec_prefix=`pkg-config --variable=exec_prefix libart-2.0`

+exec_prefix_set=no

+libs=""

+output_libs=no

+while test $# -gt 0; do

+  case "$1" in

+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;

+  *) optarg= ;;

+  esac

+  case $1 in

+    --prefix=*)

+      prefix=$optarg

+      if test $exec_prefix_set = no ; then

+        exec_prefix=$optarg

+      fi

+      ;;

+    --prefix)

+      echo $prefix

+      ;;

+    --exec-prefix=*)

+      exec_prefix=$optarg

+      exec_prefix_set=yes

+      ;;

+    --exec-prefix)

+      echo $exec_prefix

+      ;;

+    --version)

+      echo `pkg-config --modversion libart-2.0`

+      ;;

+    --cflags)

+      echo `pkg-config --cflags-only-I libart-2.0`

+      ;;

+    --libs)

+      libs=`pkg-config --libs libart-2.0`

+      output_libs=yes

+      ;;

+    --static)

+      libs="$libs -lm"

+      ;;

+    *)

+      echo "${usage}" 1>&2

+      exit 1

+      ;;

+  esac

+  shift

+done

+if test $output_libs = yes ; then

+    echo $libs

+fi

7c59d8cc	2019-04-22 14:13:27	Slávek Banko
Use pkg-config to get values in libart2-config. Signed-off-by: Slávek Banko <slavek.banko@...>
A libart2-config M Makefile.am M configure.in M libart-2.0-uninstalled.pc.in M libart-2.0.pc.in R libart-config.in
Makefile.am diff --git a/Makefile.am b/Makefile.am index aec6c5d..a7399d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,6 @@ EXTRA_DIST = \ libart.def \ - libart-config.in \ libart-2.0.pc.in \ libart-2.0-uninstalled.pc.in @@ -165,9 +164,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libart-2.0.pc - -libart2-config: libart-config - cp -f libart-config libart2-config install-data-local: install-ms-lib install-libtool-import-lib configure.in diff --git a/configure.in b/configure.in index 0010d48..ba44d56 100644 --- a/configure.in +++ b/configure.in @@ -108,7 +108,6 @@ libart-2.0-uninstalled.pc libart-zip]) -AC_CONFIG_FILES([libart-config],[chmod +x libart-config]) AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh]) AC_OUTPUT libart-2.0-uninstalled.pc.in diff --git a/libart-2.0-uninstalled.pc.in b/libart-2.0-uninstalled.pc.in index f731e54..6dddc9d 100644 --- a/libart-2.0-uninstalled.pc.in +++ b/libart-2.0-uninstalled.pc.in @@ -5,6 +5,6 @@ Name: libart Description: LGPL version of the libart library -Version: @VERSION@ +Version: @LIBART_VERSION@ Libs: ${pc_top_builddir}/${pcfiledir}/libart_lgpl_2.la Cflags: -I${pc_top_builddir}/${pcfiledir} libart-2.0.pc.in diff --git a/libart-2.0.pc.in b/libart-2.0.pc.in index 1df143b..063e1f5 100644 --- a/libart-2.0.pc.in +++ b/libart-2.0.pc.in @@ -5,6 +5,6 @@ Name: libart Description: LGPL version of the libart library -Version: @VERSION@ +Version: @LIBART_VERSION@ Libs: -L${libdir} -lart_lgpl_2 Cflags: -I${includedir}/libart-2.0 libart-config.in diff --git a/libart-config.in b/libart-config.in deleted file mode 100644 index e32f010..0000000 --- a/libart-config.in +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no -libs="" -output_libs=no - -usage="\ -Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]" - -if test $# -eq 0; then - echo "${usage}" 1>&2 - exit 1 -fi - -while test $# -gt 0; do - case "$1" in - -=) optarg=`echo "$1" \| sed 's/[-_a-zA-Z0-9]=//'` ;; - ) optarg= ;; - esac - - case $1 in - --prefix=) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo $prefix - ;; - --exec-prefix=) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo $exec_prefix - ;; - --version) - echo @LIBART_VERSION@ - ;; - --cflags) - includes=-I@includedir@/libart-2.0 - echo $includes - ;; - --libs) - libs="$libs -L@libdir@ -lart_lgpl_2" - output_libs=yes - ;; - --static) - libs="$libs -lm" - ;; - ) - echo "${usage}" 1>&2 - exit 1 - ;; - esac - shift -done - -if test $output_libs = yes ; then - echo $libs -fi - libart2-config diff --git a/libart2-config b/libart2-config new file mode 100644 index 0000000..2d97c61 --- /dev/null +++ b/libart2-config @@ -0,0 +1,68 @@ +#!/bin/sh + +usage="\ +Usage: libart2-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]" + +if test $# -eq 0; then + echo "${usage}" 1>&2 + exit 1 +fi + +if ! which pkg-config >/dev/null; then + echo "pkg-config not found on your system" 1>&2 + exit 1 +fi + +prefix=`pkg-config --variable=prefix libart-2.0` +exec_prefix=`pkg-config --variable=exec_prefix libart-2.0` +exec_prefix_set=no +libs="" +output_libs=no + +while test $# -gt 0; do + case "$1" in + -=) optarg=`echo "$1" \| sed 's/[-_a-zA-Z0-9]=//'` ;; + ) optarg= ;; + esac + + case $1 in + --prefix=) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo $prefix + ;; + --exec-prefix=) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo $exec_prefix + ;; + --version) + echo `pkg-config --modversion libart-2.0` + ;; + --cflags) + echo `pkg-config --cflags-only-I libart-2.0` + ;; + --libs) + libs=`pkg-config --libs libart-2.0` + output_libs=yes + ;; + --static) + libs="$libs -lm" + ;; + ) + echo "${usage}" 1>&2 + exit 1 + ;; + esac + shift +done + +if test $output_libs = yes ; then + echo $libs +fi
b996d3d1	2019-04-23 18:48:01	gregory guy
conversion to the cmake building system Cleanup of generated headers. Add common cmake submodule. Signed-off-by: gregory guy <g-gregory@...> Signed-off-by: Slávek Banko <slavek.banko@...>
A .gitmodules A CMakeLists.txt A ConfigureChecks.cmake A art_config.h.in A cmake A config.h.cmake A doc/CMakeLists.txt A doc/man/CMakeLists.txt A doc/man/libart2-config.1 M art_render_svp.c R art_config.h R libart-features.h
.gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..69dd7b2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "cmake"] + path = cmake + url = https://system@.../scm/git/tde-common-cmake CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..322d6ec --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,194 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +cmake_minimum_required( VERSION 2.8 ) + + +#### general package setup + +project( libart-lgpl ) +set( VERSION R14.1.0 ) +set( LIBART_VERSION 2.3.21 ) + +string( REPLACE "." ";" LIBART_VERSION_LIST ${LIBART_VERSION} ) +list( GET LIBART_VERSION_LIST 0 LIBART_MAJOR_VERSION ) +list( GET LIBART_VERSION_LIST 1 LIBART_MINOR_VERSION ) +list( GET LIBART_VERSION_LIST 2 LIBART_MICRO_VERSION ) + + +#### include essential cmake modules + +include( CheckFunctionExists ) +include( CheckSymbolExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) + Diff limit reached (max: 250 lines)
87237501	2019-04-23 18:48:37	Slávek Banko
Move the art_config.h generation to the configure script. Cleanup of generated automake files. Signed-off-by: Slávek Banko <slavek.banko@...>
M Makefile.am M configure.in R Makefile.in R aclocal.m4 R config.guess R config.sub R configure R depcomp R install-sh R ltmain.sh R missing
Diff limit reached (max: 250 lines)
2a50894a	2019-04-23 18:48:39	Slávek Banko
Add support for GCC hidden visibility. Signed-off-by: Slávek Banko <slavek.banko@...>
M art_affine.h M art_alphagamma.h M art_bpath.h M art_config.h.in M art_gray_svp.h M art_misc.h M art_pixbuf.h M art_rect.h M art_rect_svp.h M art_rect_uta.h M art_render.h M art_render_gradient.h M art_render_mask.h M art_render_svp.h M art_rgb.h M art_rgb_a_affine.h M art_rgb_affine.h M art_rgb_affine_private.h M art_rgb_bitmap_affine.h M art_rgb_pixbuf_affine.h M art_rgb_rgba_affine.h M art_rgb_svp.h M art_rgba.h M art_svp.h M art_svp_intersect.h M art_svp_ops.h M art_svp_point.h M art_svp_render_aa.h M art_svp_vpath.h M art_svp_vpath_stroke.h M art_svp_wind.h M art_uta.h M art_uta_ops.h M art_uta_rect.h M art_uta_svp.h M art_uta_vpath.h M art_vpath.h M art_vpath_bpath.h M art_vpath_dash.h M art_vpath_svp.h M libart-features.c M libart-features.h.in M libart.h M testart.c M testuta.c
Diff limit reached (max: 250 lines)
11cb023d	2019-04-23 18:48:41	Slávek Banko
cmake: Add tests. Signed-off-by: Slávek Banko <slavek.banko@...>
M CMakeLists.txt
Diff limit reached (max: 250 lines)

32fc564b	2019-04-28 14:04:50	gregory guy
conversion to the cmake building system Cleanup of generated headers. Add common cmake submodule. Signed-off-by: gregory guy <g-gregory@...> Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit b996d3d1de7126e111f2c48b59422ab434478377)
A .gitmodules A CMakeLists.txt A ConfigureChecks.cmake A art_config.h.in A cmake A config.h.cmake A doc/CMakeLists.txt A doc/man/CMakeLists.txt A doc/man/libart2-config.1 M art_render_svp.c R art_config.h R libart-features.h
Diff limit reached (max: 250 lines)
db23722d	2019-04-28 14:05:06	Slávek Banko
Move the art_config.h generation to the configure script. Cleanup of generated automake files. Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit 87237501c51b48ba3b802efbd47776bb7e410c2a)
M Makefile.am M configure.in R Makefile.in R aclocal.m4 R config.guess R config.sub R configure R depcomp R install-sh R ltmain.sh R missing
Diff limit reached (max: 250 lines)
b314a5b4	2019-04-28 14:05:06	Slávek Banko
Add support for GCC hidden visibility. Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit 2a50894a436559785a7e0f6f65dde13b0082572c)
M art_affine.h M art_alphagamma.h M art_bpath.h M art_config.h.in M art_gray_svp.h M art_misc.h M art_pixbuf.h M art_rect.h M art_rect_svp.h M art_rect_uta.h M art_render.h M art_render_gradient.h M art_render_mask.h M art_render_svp.h M art_rgb.h M art_rgb_a_affine.h M art_rgb_affine.h M art_rgb_affine_private.h M art_rgb_bitmap_affine.h M art_rgb_pixbuf_affine.h M art_rgb_rgba_affine.h M art_rgb_svp.h M art_rgba.h M art_svp.h M art_svp_intersect.h M art_svp_ops.h M art_svp_point.h M art_svp_render_aa.h M art_svp_vpath.h M art_svp_vpath_stroke.h M art_svp_wind.h M art_uta.h M art_uta_ops.h M art_uta_rect.h M art_uta_svp.h M art_uta_vpath.h M art_vpath.h M art_vpath_bpath.h M art_vpath_dash.h M art_vpath_svp.h M libart-features.c M libart-features.h.in M libart.h M testart.c M testuta.c
Diff limit reached (max: 250 lines)
7f058ae2	2019-04-28 14:05:06	Slávek Banko
cmake: Add tests. Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit 11cb023db2dafccf30bec902fc7c8fad64d9ede8)
M CMakeLists.txt
Diff limit reached (max: 250 lines)

Branch: master

Makefile.am

configure.in

libart-2.0-uninstalled.pc.in

libart-2.0.pc.in

libart-config.in

libart2-config

.gitmodules

CMakeLists.txt

Branch: r14.0.x