Skip to contentSkip to conversation

directfb: bump to version 1.4.11

PATCH New Gustavo Zacarias 3 participants 12 messages Feb 2, 2011

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/5 directfb: bump to version 1.4.11

Signed-off-by Gustavo Zacarias <[email protected]>
---
 ...directfb-1.4.10-add-missing-lm-flag-patch.patch |   49 --------------------
 package/directfb/directfb.mk                       |   12 ++---
 2 files changed, 5 insertions(+), 56 deletions(-)
 delete mode 100644 package/directfb/directfb-1.4.10-add-missing-lm-flag-patch.patch
package/directfb/directfb-1.4.10-add-missing-lm-flag-patch.patch deleted +0 -49
deleted file mode 100644
index b07f0c5..0000000
@@ -1,49 +0,0 @@
-From dbf8fd1d097420d02f0603155ca81fcc7e232a0a Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <[email protected]>
-Date: Sun, 7 Nov 2010 21:45:19 +0100
-Subject: [PATCH] Add -lm flag when nedded
-
-Signed-off-by: Lionel Landwerlin <[email protected]>
----
- configure.in          |   14 ++++++++++++++
- src/media/Makefile.am |    2 +-
- 2 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 78c842d..aa608d4 100644
---- a/configure.in
-+++ b/configure.in
-@@ -533,6 +533,20 @@ AM_CONDITIONAL(DIRECTFB_BUILD_PURE_VOODOO, test "$DIRECTFB_BUILD_PURE_VOODOO" =
- 
- AC_SUBST(DEP_VOODOO)
- 
-+dnl If we're not building a pure voodoo lib, we need the sqrt symbol
-+dnl for src/media/idirectfbfont.c
-+MEDIALIB=""
-+if test "$enable_pure_voodoo" = "no"; then
-+  AC_CHECK_LIB(m, sqrt,
-+    MEDIALIB="-lm",
-+    AC_MSG_ERROR([
-+*** DirectFB requires libm.]))
-+  if test "$enable_shared" = "yes"; then
-+    DYNLIB+=" $MEDIALIB"
-+    AC_SUBST(DYNLIB)
-+  fi
-+fi
-+AC_SUBST(MEDIALIB)
- 
- AM_CONDITIONAL(ENABLE_MULTI, test "$enable_multi" = "yes")
- 
-diff --git a/src/media/Makefile.am b/src/media/Makefile.am
-index 1a39a25..a4bdb10 100644
---- a/src/media/Makefile.am
-+++ b/src/media/Makefile.am
-@@ -35,4 +35,4 @@ libdirectfb_media_la_SOURCES = \
- 	idirectfbdatabuffer_file.c	\
- 	idirectfbdatabuffer_memory.c	\
- 	idirectfbdatabuffer_streamed.c
--
-+libdirectfb_media_la_LDFLAGS = $(MEDIALIB)
--- 
-1.7.2.3
-
package/directfb/directfb.mk +5 -7
index 309659a..0635551 100644
@@ -3,15 +3,13 @@
 # directfb
 #
 #############################################################
-DIRECTFB_VERSION_MAJOR:=1.4
-DIRECTFB_VERSION:=$(DIRECTFB_VERSION_MAJOR).10
-DIRECTFB_SITE:=http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
-DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
+DIRECTFB_VERSION_MAJOR = 1.4
+DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).11
+DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
+DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_AUTORECONF = YES
-DIRECTFB_LIBTOOL_PATCH = NO
+#DIRECTFB_LIBTOOL_PATCH = NO
 DIRECTFB_INSTALL_STAGING = YES
-DIRECTFB_INSTALL_TARGET = YES
-
 DIRECTFB_CONF_OPT = \
 	--localstatedir=/var \
 	--enable-static \
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 2/5 imagemagick: bump to version 6.6.7-4

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/imagemagick/imagemagick.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
package/imagemagick/imagemagick.mk +3 -3
index aecf7ae..2166c34 100644
@@ -3,11 +3,11 @@
 # imagemagick
 #
 #############################################################
-IMAGEMAGICK_MAJOR = 6.6.4
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-8
+
+IMAGEMAGICK_MAJOR = 6.6.7
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-4
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
 IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick
-IMAGEMAGICK_LIBTOOL_PATCH = NO
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_AUTORECONF = YES
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH 2/5 imagemagick: bump to version 6.6.7-4

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 3/5 libart: bump to version 2.3.21

In reply to Gustavo Zacarias

Bump libart to version 2.3.21 and update patch accordingly.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/libart/libart-art-config-cross.patch |   38 +++++++++++++-------------
 package/libart/libart.mk                     |    2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)
package/libart/libart-art-config-cross.patch +19 -19
index 4cf7680..a54f26a 100644
@@ -1,8 +1,23 @@
-diff -urpN libart_lgpl-2.3.20.orig/art_config.h libart_lgpl-2.3.20/art_config.h
---- libart_lgpl-2.3.20.orig/art_config.h	2008-04-11 10:50:04.000000000 +0200
-+++ libart_lgpl-2.3.20/art_config.h	2008-04-11 10:51:32.000000000 +0200
+diff -Nura libart_lgpl-2.3.21.orig/Makefile.am libart_lgpl-2.3.21/Makefile.am
+--- libart_lgpl-2.3.21.orig/Makefile.am	2011-02-01 10:07:39.687545397 -0300
++++ libart_lgpl-2.3.21/Makefile.am	2011-02-01 10:08:48.320545396 -0300
+@@ -5,11 +5,6 @@
+ 	
+ noinst_SCRIPTS = gen_art_config.sh
+ 
+-BUILT_SOURCES = art_config.h
+-
+-art_config.h:
+-	./gen_art_config.sh > art_config.h
+-
+ EXTRA_DIST = 			\
+ 	libart.def		\
+ 	libart-config.in	\
+diff -Nura libart_lgpl-2.3.21.orig/art_config.h libart_lgpl-2.3.21/art_config.h
+--- libart_lgpl-2.3.21.orig/art_config.h	2011-02-01 10:07:39.688545397 -0300
++++ libart_lgpl-2.3.21/art_config.h	2011-02-01 10:08:27.315545395 -0300
 @@ -1,9 +1,15 @@
- /* Automatically generated by gen_art_config.c */
+ /* Automatically generated by gen_art_config */
  
 +#include <limits.h>
 +

@@ -17,18 +32,3 @@ diff -urpN libart_lgpl-2.3.20.orig/art_config.h libart_lgpl-2.3.20/art_config.h
  
  typedef unsigned char art_u8;
  typedef unsigned short art_u16;
-diff -urpN libart_lgpl-2.3.20.orig/Makefile.am libart_lgpl-2.3.20/Makefile.am
---- libart_lgpl-2.3.20.orig/Makefile.am	2008-04-11 10:50:04.000000000 +0200
-+++ libart_lgpl-2.3.20/Makefile.am	2008-04-11 10:50:31.000000000 +0200
-@@ -3,11 +3,6 @@ noinst_PROGRAMS = testart testuta gen_ar
- bin_SCRIPTS = \
- 	libart2-config
- 
--BUILT_SOURCES = art_config.h
--
--art_config.h:	gen_art_config$(EXEEXT)
--	./gen_art_config > art_config.h
--
- EXTRA_DIST = 			\
- 	libart.def		\
- 	libart-config.in	\
package/libart/libart.mk +1 -1
index e21899d..ec66c2f 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBART_VERSION = 2.3.20
+LIBART_VERSION = 2.3.21
 LIBART_SOURCE = libart_lgpl-$(LIBART_VERSION).tar.gz
 LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/
 LIBART_AUTORECONF = YES
Signature · 1 line
1.7.3.4
#4 lore raw

PATCH 3/5 libart: bump to version 2.3.21

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Bump libart to version 2.3.21 and update patch accordingly. Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

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

PATCH 4/5 libidn: bump to version 1.19

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/libidn/libidn.mk |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
package/libidn/libidn.mk +1 -3
index 1627c96..cc8c08f 100644
@@ -4,13 +4,11 @@
 #
 #############################################################
 
-LIBIDN_VERSION = 1.15
+LIBIDN_VERSION = 1.19
 LIBIDN_SITE = http://ftp.gnu.org/gnu/libidn/
 LIBIDN_INSTALL_STAGING = YES
-LIBIDN_INSTALL_TARGET = YES
 LIBIDN_CONF_ENV = EMACS="no"
 LIBIDN_CONF_OPT = --enable-shared --disable-java --enable-csharp=no
-LIBIDN_LIBTOOL_PATCH = NO
 LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 define LIBIDN_REMOVE_BINARY
Signature · 1 line
1.7.3.4
#6 lore raw

PATCH 4/5 libidn: bump to version 1.19

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#7 lore raw

PATCH 5/5 dnsmasq: idn support requires wchar

In reply to Gustavo Zacarias

IDN support requires wchar, otherwise libintl will fail to build.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/dnsmasq/Config.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/dnsmasq/Config.in +1 -0
index a8d0d9a..e9c4870 100644
@@ -23,6 +23,7 @@ config BR2_PACKAGE_DNSMASQ_DHCP
 config BR2_PACKAGE_DNSMASQ_IDN
 	bool "IDN support (BIG!)"
 	depends on BR2_PACKAGE_DNSMASQ
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBINTL
 	select BR2_PACKAGE_LIBIDN
 	help
Signature · 1 line
1.7.3.4
#8 lore raw

PATCH 5/5 dnsmasq: idn support requires wchar

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> IDN support requires wchar, otherwise libintl will fail to build. Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

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

PATCH 1/5 directfb: bump to version 1.4.11

In reply to Gustavo Zacarias

package/directfb/directfb.mk line 11

Quoted 2 lines · On Wed, 2 Feb 2011 09:22:20 -0300 Gustavo Zacarias <[email protected]>…
package/directfb/directfb.mk +1 -1
-DIRECTFB_LIBTOOL_PATCH = NO
+#DIRECTFB_LIBTOOL_PATCH = NO

Just remove the line ?

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#10 lore raw

PATCH 1/5 directfb: bump to version 1.4.11

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> On Wed, 2 Feb 2011 09:22:20 -0300

Quoted 2 lines · Thomas> Gustavo Zacarias <[email protected]> wrote:

package/directfb/directfb.mk line 11

Quoted 2 lines
package/directfb/directfb.mk +1 -1
-DIRECTFB_LIBTOOL_PATCH = NO
+#DIRECTFB_LIBTOOL_PATCH = NO

Thomas> Just remove the line ?

Yeah, I did that while committing. I also renamed the ppc patch so it has the right version number.

Signature · 1 line
Bye, Peter Korsgaard