Skip to contentSkip to conversation

package/cegui: remove tinyxml2 dependency

PATCH New Fabrice Fontaine 4 participants 6 messages May 10, 2020 – May 8, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/cegui: remove tinyxml2 dependency

Remove tinyxml2 dependency as tinyxml2 is not a part of version 0.8.7.

Indeed, tinyxml2 has been added in September 2016 with
https://github.com/cegui/cegui/commit/49b3fd9d6f0d7555198379514b155bcd61daef67
whereas version 0.8.7 has been released in April 2016

---
 package/cegui/cegui.mk | 7 -------
 1 file changed, 7 deletions(-)
package/cegui/cegui.mk +0 -7
index 9640a15116..6158ef129c 100644
@@ -83,13 +83,6 @@ else
 CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_TINYXML2),y)
-CEGUI_DEPENDENCIES += tinyxml2
-CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON
-else
-CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_LIBFREEIMAGE),y)
 CEGUI_DEPENDENCIES += libfreeimage
 CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/2 package/cegui: add libfribidi optional dependency

libfribidi is an optional dependency (enabled by default) since version 0.8.0 and
https://github.com/cegui/cegui/commit/17974582e6b6a7d8f5853b0272433f130f82e52a

---
 package/cegui/cegui.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/cegui/cegui.mk +7 -0
index 6158ef129c..73d0c22ce5 100644
@@ -62,6 +62,13 @@ else
 CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
+CEGUI_DEPENDENCIES += libfribidi
+CEGUI_CONF_OPTS += -DCEGUI_USE_FRIBIDI=ON
+else
+CEGUI_CONF_OPTS += -DCEGUI_USE_FRIBIDI=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
 CEGUI_DEPENDENCIES += libxml2
 CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/2 package/cegui: add libfribidi optional dependency

Hello Fabrice,

Quoted 17 lines · Fabrice Fontaine

libfribidi is an optional dependency (enabled by default) since version 0.8.0 and
https://github.com/cegui/cegui/commit/17974582e6b6a7d8f5853b0272433f130f82e52a

---
  package/cegui/cegui.mk | 7 +++++++
  1 file changed, 7 insertions(+)
package/cegui/cegui.mk +0 -0
index 6158ef129c..73d0c22ce5 100644
@@ -62,6 +62,13 @@ else
  CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF
  endif
 

package/cegui/cegui.mk else · line 74

Quoted 10 lines
package/cegui/cegui.mk +7 -0
+ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
+CEGUI_DEPENDENCIES += libfribidi
+CEGUI_CONF_OPTS += -DCEGUI_USE_FRIBIDI=ON
+else
+CEGUI_CONF_OPTS += -DCEGUI_USE_FRIBIDI=OFF
+endif
+
  ifeq ($(BR2_PACKAGE_LIBXML2),y)
  CEGUI_DEPENDENCIES += libxml2
  CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON

Best
Bartek

#3 lore raw

PATCH 2/2 package/cegui: add libfribidi optional dependency

In reply to Fabrice Fontaine

Fabrice, All,

On 2020-05-10 10:52 +0200, Fabrice Fontaine spake thusly:

Quoted 5 lines

libfribidi is an optional dependency (enabled by default) since version 0.8.0 and
https://github.com/cegui/cegui/commit/17974582e6b6a7d8f5853b0272433f130f82e52a

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 25 lines
---
 package/cegui/cegui.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/cegui/cegui.mk +7 -0
index 6158ef129c..73d0c22ce5 100644
@@ -62,6 +62,13 @@ else
 CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
+CEGUI_DEPENDENCIES += libfribidi
+CEGUI_CONF_OPTS += -DCEGUI_USE_FRIBIDI=ON
+else
+CEGUI_CONF_OPTS += -DCEGUI_USE_FRIBIDI=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
 CEGUI_DEPENDENCIES += libxml2
 CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
Signature · 1 line
2.26.2
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 2/2 package/cegui: add libfribidi optional dependency

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Fabrice, All,
On 2020-05-10 10:52 +0200, Fabrice Fontaine spake thusly:

Quoted 5 lines

libfribidi is an optional dependency (enabled by default) since version 0.8.0 and
https://github.com/cegui/cegui/commit/17974582e6b6a7d8f5853b0272433f130f82e52a

Applied to master, thanks.

Committed to 2021.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/2 package/cegui: remove tinyxml2 dependency

In reply to Fabrice Fontaine

Fabrice, All,

On 2020-05-10 10:52 +0200, Fabrice Fontaine spake thusly:

Quoted 7 lines

Remove tinyxml2 dependency as tinyxml2 is not a part of version 0.8.7.

Indeed, tinyxml2 has been added in September 2016 with
https://github.com/cegui/cegui/commit/49b3fd9d6f0d7555198379514b155bcd61daef67
whereas version 0.8.7 has been released in April 2016

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 25 lines
---
 package/cegui/cegui.mk | 7 -------
 1 file changed, 7 deletions(-)
package/cegui/cegui.mk +0 -7
index 9640a15116..6158ef129c 100644
@@ -83,13 +83,6 @@ else
 CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_TINYXML2),y)
-CEGUI_DEPENDENCIES += tinyxml2
-CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON
-else
-CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_LIBFREEIMAGE),y)
 CEGUI_DEPENDENCIES += libfreeimage
 CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
Signature · 1 line
2.26.2
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'